[sc1.0-cvs] CVS update: /sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/main/message/, /sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/main/history/

yanas at dev.java.net yanas at dev.java.net
Fri Feb 24 11:37:01 CET 2006


User: yanas   
Date: 2006/02/24 02:37:01

Log:
 Changed to use metacontact and metagroup

File Changes:

Directory: /sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/main/message/
===========================================================================================

File [changed]: ChatContactPanel.java
Url: https://sip-communicator-1-0-draft.dev.java.net/source/browse/sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/main/message/ChatContactPanel.java?r1=1.2&r2=1.3
Delta lines:  +7 -9
-------------------
--- ChatContactPanel.java	5 Feb 2006 19:34:15 -0000	1.2
+++ ChatContactPanel.java	24 Feb 2006 10:36:58 -0000	1.3
@@ -8,7 +8,6 @@
 package net.java.sip.communicator.impl.gui.main.message;
 
 import java.awt.BorderLayout;
-import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.Font;
@@ -17,16 +16,15 @@
 import java.awt.Graphics2D;
 
 import javax.swing.BorderFactory;
-import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.border.BevelBorder;
 
-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.impl.gui.main.ContactItem;
 import net.java.sip.communicator.impl.gui.main.customcontrols.SIPCommButton;
 import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager;
+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 ChatContactPanel extends JPanel {
 	
@@ -54,12 +52,12 @@
 	private JPanel contactNamePanel 
 					= new JPanel(new FlowLayout(FlowLayout.CENTER, 0, 0));
 	
-	private ContactItem contactItem;
+	private MetaContact contactItem;
 	
 	private boolean isMouseOver = false; 
 	private boolean isSelected = false;
 	
-	public ChatContactPanel(ContactItem contactItem){
+	public ChatContactPanel(MetaContact contactItem){
 		
 		super(new BorderLayout());
 	
@@ -79,10 +77,10 @@
 	
 	public void init(){
 		
-		this.personNameLabel.setText(contactItem.getNickName());
+		this.personNameLabel.setText(contactItem.getDisplayName());
 		this.personNameLabel.setFont(this.getFont().deriveFont(Font.BOLD));
 		
-		this.personPhotoLabel.setIcon(new ImageIcon(contactItem.getPhoto()));
+		//this.personPhotoLabel.setIcon(new ImageIcon(contactItem.getPhoto()));
 		
 		this.buttonsPanel.add(callButton);
 		this.buttonsPanel.add(infoButton);

File [changed]: ChatConferencePanel.java
Url: https://sip-communicator-1-0-draft.dev.java.net/source/browse/sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/main/message/ChatConferencePanel.java?r1=1.2&r2=1.3
Delta lines:  +2 -3
-------------------
--- ChatConferencePanel.java	5 Feb 2006 19:34:15 -0000	1.2
+++ ChatConferencePanel.java	24 Feb 2006 10:36:58 -0000	1.3
@@ -15,10 +15,9 @@
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 
-import net.java.sip.communicator.impl.gui.main.ContactItem;
 import net.java.sip.communicator.impl.gui.main.customcontrols.SIPCommButton;
-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 ChatConferencePanel extends JPanel {
 	
@@ -59,7 +58,7 @@
 		this.add(buttonPanel, BorderLayout.SOUTH);		
 	}
 	
-	public void addContactToChat (ContactItem contactItem){		
+	public void addContactToChat (MetaContact contactItem){		
 		
 		chatContactPanel = new ChatContactPanel(contactItem);
 				

File [changed]: ChatConferenceList.java
Url: https://sip-communicator-1-0-draft.dev.java.net/source/browse/sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/main/message/ChatConferenceList.java?r1=1.2&r2=1.3
Delta lines:  +0 -3
-------------------
--- ChatConferenceList.java	5 Feb 2006 19:34:16 -0000	1.2
+++ ChatConferenceList.java	24 Feb 2006 10:36:58 -0000	1.3
@@ -9,9 +9,6 @@
 
 import javax.swing.JList;
 
-import net.java.sip.communicator.impl.gui.main.ContactItem;
-import net.java.sip.communicator.impl.gui.main.ContactList;
-
 public class ChatConferenceList extends JList {
 	
 	public ChatConferenceList (){

File [changed]: MessageWindow.java
Url: https://sip-communicator-1-0-draft.dev.java.net/source/browse/sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/main/message/MessageWindow.java?r1=1.2&r2=1.3
Delta lines:  +5 -6
-------------------
--- MessageWindow.java	5 Feb 2006 19:34:17 -0000	1.2
+++ MessageWindow.java	24 Feb 2006 10:36:58 -0000	1.3
@@ -14,10 +14,9 @@
 import javax.swing.JPanel;
 import javax.swing.JSplitPane;
 
-import net.java.sip.communicator.impl.gui.main.ContactItem;
 import net.java.sip.communicator.impl.gui.main.MainFrame;
-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 MessageWindow extends JFrame{
 	
@@ -86,20 +85,20 @@
 		this.getContentPane().add(messagePane);		
 	}
 	
-	public void addContactToChat (ContactItem contactItem){		
+	public void addContactToChat (MetaContact contactItem){		
 		
 		this.chatContacts.add(contactItem);
 		
 		this.chatConferencePanel.addContactToChat(contactItem);
 		
-		this.sendPanel.addProtocols(contactItem.getProtocolList());
+		//this.sendPanel.addProtocols(contactItem.getProtocolList());
 		
-		this.windowTitle += contactItem.getNickName() + " ";
+		this.windowTitle += contactItem.getDisplayName() + " ";
 		
 		this.setTitle(this.windowTitle);
 	}
 
-	public void removeContactFromChat (ContactItem contactItem){
+	public void removeContactFromChat (MetaContact contactItem){
 		this.chatContacts.remove(contactItem);
 	}
 	

Directory: /sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/main/history/
===========================================================================================

File [changed]: HistoryWindow.java
Url: https://sip-communicator-1-0-draft.dev.java.net/source/browse/sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/main/history/HistoryWindow.java?r1=1.2&r2=1.3
Delta lines:  +6 -6
-------------------
--- HistoryWindow.java	5 Feb 2006 19:33:20 -0000	1.2
+++ HistoryWindow.java	24 Feb 2006 10:36:58 -0000	1.3
@@ -16,10 +16,10 @@
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 
-import net.java.sip.communicator.impl.gui.main.ContactItem;
 import net.java.sip.communicator.impl.gui.main.i18n.Messages;
 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 HistoryWindow extends JFrame {	
 	
@@ -41,7 +41,7 @@
 	
 	private Vector contacts;
 	
-	private ContactItem contactItem;
+	private MetaContact contactItem;
 	
 	String title = Messages.getString("history") + " - ";
 	
@@ -87,19 +87,19 @@
 		
 		for (int i = 0; i < contacts.size(); i ++){
 			
-			ContactItem contact = (ContactItem)contacts.get(i);
+			MetaContact contact = (MetaContact)contacts.get(i);
 			
-			this.title += " " + contact.getNickName(); 
+			this.title += " " + contact.getDisplayName(); 
 		}
 		
 		this.setTitle(title);
 	}	
 	
-	public void setContact(ContactItem contact) {
+	public void setContact(MetaContact contact) {
 		
 		this.contactItem = contact;
 		
-		this.title += " " + contact.getNickName(); 
+		this.title += " " + contact.getDisplayName(); 
 				
 		this.setTitle(title);
 	}	




---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe at sip-communicator-1-0-draft.dev.java.net
For additional commands, e-mail: cvs-help at sip-communicator-1-0-draft.dev.java.net





More information about the commits mailing list