diff --git a/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java b/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java index 1d029f346..956d1d973 100644 --- a/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java +++ b/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java @@ -9,6 +9,9 @@ import net.java.sip.communicator.service.contactlist.*; import net.java.sip.communicator.service.contactlist.event.*; import net.java.sip.communicator.service.protocol.*; +import net.java.sip.communicator.service.protocol.event.ContactPresenceStatusListener; +import net.java.sip.communicator.service.protocol.event.SubscriptionListener; + import java.util.*; import org.osgi.framework.*; import net.java.sip.communicator.util.Logger; @@ -404,6 +407,11 @@ private void synchronizeOpSetWithServerContactList( rootMetaGroup.addMetaContact(newMetaContact); } + + //presenceOpSet.addSubsciptionListener( + // SubscriptionListener) + //presenceOpSet.addContactPresenceStatusListener( + // ContactPresenceStatusListener) } /** diff --git a/src/net/java/sip/communicator/impl/gui/Activator.java b/src/net/java/sip/communicator/impl/gui/Activator.java index 85bfc9685..0657ec597 100644 --- a/src/net/java/sip/communicator/impl/gui/Activator.java +++ b/src/net/java/sip/communicator/impl/gui/Activator.java @@ -23,19 +23,23 @@ public class Activator implements BundleActivator private LoginManager loginManager; - private BundleContext bundleContext; - - + public void start(BundleContext bundleContext) throws Exception { - this.bundleContext = bundleContext; - this.loginManager = new LoginManager(bundleContext); this.loginManager.setMainFrame(communicatorMain.getMainFrame()); - + try { + ServiceReference clistReference + = bundleContext.getServiceReference + (MetaContactListService.class.getName()); + + MetaContactListService contactListService + = (MetaContactListService)bundleContext + .getService(clistReference); + logger.logEntry(); //Create the ui service @@ -48,11 +52,14 @@ public void start(BundleContext bundleContext) throws Exception UIService.class.getName(), this.uiService, null); logger.info("UI Service ...[REGISTERED]"); - - communicatorMain.showCommunicator(); + + + this.communicatorMain.getMainFrame() + .setContactList(contactListService); + + this.communicatorMain.showCommunicator(); SwingUtilities.invokeLater(new RunLogin()); - } finally { diff --git a/src/net/java/sip/communicator/impl/gui/main/CallPanel.java b/src/net/java/sip/communicator/impl/gui/main/CallPanel.java index 2a996eeab..d8f097369 100644 --- a/src/net/java/sip/communicator/impl/gui/main/CallPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/CallPanel.java @@ -8,23 +8,16 @@ package net.java.sip.communicator.impl.gui.main; import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Container; -import java.awt.Dimension; import java.awt.FlowLayout; -import java.awt.Image; -import java.awt.Rectangle; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import javax.swing.BorderFactory; import javax.swing.JButton; import javax.swing.JComboBox; -import javax.swing.JComponent; import javax.swing.JPanel; 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; /** diff --git a/src/net/java/sip/communicator/impl/gui/main/CallReceivePanel.java b/src/net/java/sip/communicator/impl/gui/main/CallReceivePanel.java index 860832a2b..3dc081a55 100644 --- a/src/net/java/sip/communicator/impl/gui/main/CallReceivePanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/CallReceivePanel.java @@ -8,7 +8,6 @@ package net.java.sip.communicator.impl.gui.main; import java.awt.BorderLayout; -import java.awt.Color; import java.awt.FlowLayout; import java.awt.Font; import java.awt.Image; @@ -21,7 +20,6 @@ import javax.swing.JPanel; 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; public class CallReceivePanel extends JDialog{ diff --git a/src/net/java/sip/communicator/impl/gui/main/CommunicatorMain.java b/src/net/java/sip/communicator/impl/gui/main/CommunicatorMain.java index db9678208..e41156010 100755 --- a/src/net/java/sip/communicator/impl/gui/main/CommunicatorMain.java +++ b/src/net/java/sip/communicator/impl/gui/main/CommunicatorMain.java @@ -17,7 +17,6 @@ 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,8 +32,6 @@ public class CommunicatorMain { private MainFrame mainFrame; - private MetaContactListService contactList; - public CommunicatorMain() { this.setDefaultThemePack(); diff --git a/src/net/java/sip/communicator/impl/gui/main/DialPanel.java b/src/net/java/sip/communicator/impl/gui/main/DialPanel.java index 13caf05fe..c9102aeb4 100755 --- a/src/net/java/sip/communicator/impl/gui/main/DialPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/DialPanel.java @@ -9,7 +9,6 @@ import java.awt.BorderLayout; import java.awt.FlowLayout; -import java.awt.Font; import java.awt.GridLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java index 790c7c02a..e2183096e 100755 --- a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java +++ b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java @@ -8,17 +8,12 @@ package net.java.sip.communicator.impl.gui.main; import java.awt.BorderLayout; -import java.awt.Cursor; import java.awt.Dimension; import java.awt.Toolkit; -import java.awt.event.ComponentAdapter; -import java.awt.event.ComponentEvent; import java.beans.PropertyChangeEvent; -import java.util.Enumeration; import java.util.Iterator; import java.util.Map; -import javax.swing.ImageIcon; import javax.swing.JFrame; import javax.swing.JPanel; @@ -26,7 +21,6 @@ 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.impl.gui.main.utils.SelectorBoxItem; import net.java.sip.communicator.service.contactlist.MetaContactListService; import net.java.sip.communicator.service.protocol.OperationFailedException; import net.java.sip.communicator.service.protocol.OperationSetPersistentPresence; diff --git a/src/net/java/sip/communicator/impl/gui/main/MainTabbedPane.java b/src/net/java/sip/communicator/impl/gui/main/MainTabbedPane.java index 7c29f7d64..b74af3b4d 100755 --- a/src/net/java/sip/communicator/impl/gui/main/MainTabbedPane.java +++ b/src/net/java/sip/communicator/impl/gui/main/MainTabbedPane.java @@ -7,21 +7,14 @@ package net.java.sip.communicator.impl.gui.main; -import java.awt.Color; import java.awt.Graphics; -import java.util.Vector; -import javax.swing.JButton; -import javax.swing.JList; import javax.swing.JPanel; import javax.swing.JTabbedPane; -import javax.swing.ListModel; -import javax.swing.event.ListDataListener; import net.java.sip.communicator.impl.gui.main.contactlist.ContactListPanel; import net.java.sip.communicator.impl.gui.main.i18n.Messages; import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; -import net.java.sip.communicator.service.contactlist.MetaContactListService; /** * @author Yana Stamcheva diff --git a/src/net/java/sip/communicator/impl/gui/main/StatusPanel.java b/src/net/java/sip/communicator/impl/gui/main/StatusPanel.java index b5a459980..319369e41 100644 --- a/src/net/java/sip/communicator/impl/gui/main/StatusPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/StatusPanel.java @@ -9,7 +9,6 @@ import java.awt.FlowLayout; import java.awt.Image; -import java.util.Enumeration; import java.util.Hashtable; import java.util.Map; @@ -19,9 +18,6 @@ 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.protocol.OperationFailedException; -import net.java.sip.communicator.service.protocol.OperationSetPresence; -import net.java.sip.communicator.service.protocol.PresenceStatus; public class StatusPanel extends JPanel { diff --git a/src/net/java/sip/communicator/impl/gui/main/StatusSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/StatusSelectorBox.java index a220ac9b0..381060018 100644 --- a/src/net/java/sip/communicator/impl/gui/main/StatusSelectorBox.java +++ b/src/net/java/sip/communicator/impl/gui/main/StatusSelectorBox.java @@ -9,9 +9,7 @@ import java.awt.Component; import java.awt.Dimension; -import java.awt.FlowLayout; import java.awt.Graphics; -import java.awt.Graphics2D; import java.awt.Image; import java.awt.Point; import java.awt.event.ActionEvent; @@ -31,12 +29,10 @@ import net.java.sip.communicator.impl.gui.Activator; import net.java.sip.communicator.impl.gui.main.customcontrols.AntialiasedPopupMenu; -import net.java.sip.communicator.impl.gui.main.customcontrols.SIPCommButton; import net.java.sip.communicator.impl.gui.main.i18n.Messages; import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; import net.java.sip.communicator.service.protocol.OperationFailedException; -import net.java.sip.communicator.service.protocol.OperationSetPresence; import net.java.sip.communicator.service.protocol.PresenceStatus; import net.java.sip.communicator.service.protocol.icqconstants.IcqStatusEnum; import net.java.sip.communicator.util.Logger; diff --git a/src/net/java/sip/communicator/impl/gui/main/configforms/AccountsConfigurationForm.java b/src/net/java/sip/communicator/impl/gui/main/configforms/AccountsConfigurationForm.java index 23f6bd8a5..809ff9cdf 100644 --- a/src/net/java/sip/communicator/impl/gui/main/configforms/AccountsConfigurationForm.java +++ b/src/net/java/sip/communicator/impl/gui/main/configforms/AccountsConfigurationForm.java @@ -15,7 +15,6 @@ import javax.swing.JPanel; 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.gui.ConfigurationForm; diff --git a/src/net/java/sip/communicator/impl/gui/main/configforms/AppearanceConfigurationForm.java b/src/net/java/sip/communicator/impl/gui/main/configforms/AppearanceConfigurationForm.java index d4fc93f41..0485e8bcb 100644 --- a/src/net/java/sip/communicator/impl/gui/main/configforms/AppearanceConfigurationForm.java +++ b/src/net/java/sip/communicator/impl/gui/main/configforms/AppearanceConfigurationForm.java @@ -20,7 +20,6 @@ import net.java.sip.communicator.impl.gui.main.i18n.Messages; 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.gui.ConfigurationForm; diff --git a/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java b/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java index fed67b1d1..7f3650977 100644 --- a/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java +++ b/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java @@ -8,35 +8,18 @@ package net.java.sip.communicator.impl.gui.main.configforms; import java.awt.BorderLayout; -import java.awt.Dimension; -import java.awt.FlowLayout; import java.awt.Graphics; -import java.awt.GridLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.awt.event.InputEvent; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.util.Vector; -import javax.swing.BorderFactory; -import javax.swing.BoxLayout; -import javax.swing.JButton; -import javax.swing.JDialog; import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JList; import javax.swing.JPanel; import javax.swing.JScrollPane; -import javax.swing.border.BevelBorder; -import net.java.sip.communicator.impl.gui.main.configforms.AppearanceConfigurationForm; -import net.java.sip.communicator.impl.gui.main.configforms.GeneralConfigurationForm; -import net.java.sip.communicator.impl.gui.main.customcontrols.ListCellPanel; -import net.java.sip.communicator.impl.gui.main.customcontrols.SIPCommButton; import net.java.sip.communicator.impl.gui.main.customcontrols.SIPCommList; import net.java.sip.communicator.impl.gui.main.customcontrols.TitlePanel; -import net.java.sip.communicator.impl.gui.main.message.MessageWindow; 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.service.gui.ConfigurationContainer; diff --git a/src/net/java/sip/communicator/impl/gui/main/configforms/GeneralConfigurationForm.java b/src/net/java/sip/communicator/impl/gui/main/configforms/GeneralConfigurationForm.java index af65829e4..dd2512e36 100644 --- a/src/net/java/sip/communicator/impl/gui/main/configforms/GeneralConfigurationForm.java +++ b/src/net/java/sip/communicator/impl/gui/main/configforms/GeneralConfigurationForm.java @@ -7,7 +7,6 @@ package net.java.sip.communicator.impl.gui.main.configforms; -import java.awt.BorderLayout; import java.awt.Component; import java.awt.Dimension; import java.awt.Graphics; @@ -21,10 +20,8 @@ import net.java.sip.communicator.impl.gui.main.i18n.Messages; 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.gui.ConfigurationForm; -import net.java.sip.communicator.service.gui.UIService; /** * @author Yana Stamcheva diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPanel.java index 3bbbf689e..c1cedaf3f 100755 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPanel.java @@ -25,7 +25,6 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreePath; -import net.java.sip.communicator.impl.gui.main.ContactRightButtonMenu; import net.java.sip.communicator.impl.gui.main.MainFrame; import net.java.sip.communicator.impl.gui.main.message.MessageWindow; import net.java.sip.communicator.service.contactlist.MetaContact; @@ -71,12 +70,9 @@ private void initTree() { this.contactListTree = new ContactListTree(rootNode); - this.contactListTree.addAllContacts(this.rootNode, root); - this.contactListTree.addMouseListener(this); this.treePanel.add(contactListTree, BorderLayout.NORTH); - } public void mouseClicked(MouseEvent e) { diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeModel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeModel.java index 019c5f31a..13c5775b9 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeModel.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeModel.java @@ -9,7 +9,6 @@ import javax.swing.event.TreeModelEvent; import javax.swing.event.TreeModelListener; -import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreeNode; diff --git a/src/net/java/sip/communicator/impl/gui/main/ContactRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java similarity index 97% rename from src/net/java/sip/communicator/impl/gui/main/ContactRightButtonMenu.java rename to src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java index 03ee363d9..afb4a7988 100644 --- a/src/net/java/sip/communicator/impl/gui/main/ContactRightButtonMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java @@ -5,7 +5,7 @@ * See terms of license at gnu.org. */ -package net.java.sip.communicator.impl.gui.main; +package net.java.sip.communicator.impl.gui.main.contactlist; import java.awt.Component; import java.awt.Point; @@ -13,10 +13,10 @@ import java.awt.event.ActionListener; import javax.swing.ImageIcon; -import javax.swing.JMenu; import javax.swing.JMenuItem; import javax.swing.JPopupMenu; +import net.java.sip.communicator.impl.gui.main.MainFrame; import net.java.sip.communicator.impl.gui.main.customcontrols.AntialiasedMenu; import net.java.sip.communicator.impl.gui.main.customcontrols.AntialiasedMenuItem; import net.java.sip.communicator.impl.gui.main.customcontrols.MessageDialog; diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/ListCellPanel.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/ListCellPanel.java index 76e517846..441bf33a7 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/ListCellPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/ListCellPanel.java @@ -9,15 +9,12 @@ import java.awt.BorderLayout; import java.awt.Color; -import java.awt.Font; import java.awt.GradientPaint; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; -import javax.swing.Icon; -import javax.swing.JLabel; import javax.swing.JPanel; import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/MessageDialog.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/MessageDialog.java index 0ba682d4a..9793bab06 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/MessageDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/MessageDialog.java @@ -18,7 +18,6 @@ import javax.swing.JCheckBox; import javax.swing.JDialog; import javax.swing.JLabel; -import javax.swing.JPanel; import net.java.sip.communicator.impl.gui.main.i18n.Messages; import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommButton.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommButton.java index 1075ae986..5d04da0c9 100755 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommButton.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommButton.java @@ -10,13 +10,12 @@ import java.awt.Dimension; import java.awt.Graphics; import java.awt.Image; -import java.awt.image.BufferedImage; import javax.swing.ImageIcon; import javax.swing.JButton; -import net.java.sip.communicator.impl.gui.main.utils.Constants; 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; /** diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommPasswordField.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommPasswordField.java index c25912b1e..935839d9d 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommPasswordField.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommPasswordField.java @@ -8,10 +8,8 @@ package net.java.sip.communicator.impl.gui.main.customcontrols; import java.awt.BasicStroke; -import java.awt.Color; import java.awt.Graphics; import java.awt.Graphics2D; -import java.awt.geom.RoundRectangle2D; import javax.swing.JPasswordField; diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommTextField.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommTextField.java index 015c9cbe3..6490b5a91 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommTextField.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommTextField.java @@ -8,11 +8,8 @@ package net.java.sip.communicator.impl.gui.main.customcontrols; import java.awt.BasicStroke; -import java.awt.Color; import java.awt.Graphics; import java.awt.Graphics2D; -import java.awt.Shape; -import java.awt.geom.RoundRectangle2D; import javax.swing.JTextField; diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommToolBar.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommToolBar.java index 041be76bc..f5b47a5e1 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommToolBar.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommToolBar.java @@ -12,13 +12,11 @@ import java.awt.Graphics2D; import java.awt.Image; -import javax.swing.BorderFactory; import javax.swing.Box; import javax.swing.JSeparator; import javax.swing.JToolBar; import net.java.sip.communicator.impl.gui.main.ui.SIPCommToolBarSeparatorUI; -import net.java.sip.communicator.impl.gui.main.utils.Constants; import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; public class SIPCommToolBar extends JToolBar { diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/TransparentBackground.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/TransparentBackground.java index 317211be4..b9c4ae48d 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/TransparentBackground.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/TransparentBackground.java @@ -1,16 +1,19 @@ package net.java.sip.communicator.impl.gui.main.customcontrols; -import javax.swing.*; +import java.awt.AWTException; +import java.awt.Color; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Rectangle; +import java.awt.Robot; +import java.awt.Window; +import java.awt.image.BufferedImage; + +import javax.swing.JComponent; import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; import net.java.sip.communicator.impl.gui.main.utils.Constants; -import java.awt.*; - -import java.awt.event.*; - -import java.awt.image.*; - public class TransparentBackground extends JComponent { diff --git a/src/net/java/sip/communicator/impl/gui/main/history/SearchPanel.java b/src/net/java/sip/communicator/impl/gui/main/history/SearchPanel.java index f45f92185..74df50593 100644 --- a/src/net/java/sip/communicator/impl/gui/main/history/SearchPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/history/SearchPanel.java @@ -8,7 +8,6 @@ package net.java.sip.communicator.impl.gui.main.history; import java.awt.BorderLayout; -import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Graphics; import java.awt.GridLayout; @@ -24,10 +23,8 @@ import javax.swing.JRadioButton; import javax.swing.JTextField; -import net.java.sip.communicator.impl.gui.main.customcontrols.SIPCommButton; import net.java.sip.communicator.impl.gui.main.i18n.Messages; 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; public class SearchPanel extends JPanel implements ActionListener { diff --git a/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java b/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java index 7b7efb646..631271028 100644 --- a/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java +++ b/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java @@ -127,15 +127,6 @@ public void registrationStateChanged(RegistrationStateChangeEvent evt) { this.mainFrame.setProtocolProvider(icqProtocolProvider); this.mainFrame.setSupportedOperationSets(supportedOpSets); - - ServiceReference clistReference - = bc.getServiceReference(MetaContactListService.class.getName()); - - MetaContactListService contactListService - = (MetaContactListService)bc.getService(clistReference); - - this.mainFrame.setContactList(contactListService); - } else if(evt.getNewState() .equals(RegistrationState.AUTHENTICATION_FAILED)){ diff --git a/src/net/java/sip/communicator/impl/gui/main/login/LoginWindow.java b/src/net/java/sip/communicator/impl/gui/main/login/LoginWindow.java index 5808165e1..40db14c32 100644 --- a/src/net/java/sip/communicator/impl/gui/main/login/LoginWindow.java +++ b/src/net/java/sip/communicator/impl/gui/main/login/LoginWindow.java @@ -23,8 +23,6 @@ import javax.swing.JDialog; import javax.swing.JLabel; import javax.swing.JPanel; -import javax.swing.JPasswordField; -import javax.swing.JTextField; import net.java.sip.communicator.impl.gui.main.MainFrame; import net.java.sip.communicator.impl.gui.main.customcontrols.SIPCommPasswordField; @@ -42,7 +40,7 @@ public class LoginWindow extends JDialog private JLabel passwdLabel = new JLabel(Messages.getString("passwd")); - private JLabel protocolLabel = new JLabel(Messages.getString("protocol")); + //private JLabel protocolLabel = new JLabel(Messages.getString("protocol")); private SIPCommTextField uinTextField = new SIPCommTextField(15); diff --git a/src/net/java/sip/communicator/impl/gui/main/message/MessageSendPanel.java b/src/net/java/sip/communicator/impl/gui/main/message/MessageSendPanel.java index 1906e618f..6f359a763 100644 --- a/src/net/java/sip/communicator/impl/gui/main/message/MessageSendPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/message/MessageSendPanel.java @@ -16,13 +16,11 @@ import java.util.Calendar; import javax.swing.BorderFactory; -import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JEditorPane; import javax.swing.JLabel; import javax.swing.JPanel; -import net.java.sip.communicator.impl.gui.main.StatusSelectorBox; import net.java.sip.communicator.impl.gui.main.i18n.Messages; import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; import net.java.sip.communicator.impl.gui.main.utils.Constants; diff --git a/src/net/java/sip/communicator/impl/gui/main/message/SmiliesSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/message/SmiliesSelectorBox.java index 4d0577306..d83e775c8 100644 --- a/src/net/java/sip/communicator/impl/gui/main/message/SmiliesSelectorBox.java +++ b/src/net/java/sip/communicator/impl/gui/main/message/SmiliesSelectorBox.java @@ -16,7 +16,6 @@ import net.java.sip.communicator.impl.gui.main.customcontrols.BoxPopupMenu; import net.java.sip.communicator.impl.gui.main.customcontrols.MsgToolbarButton; -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.utils.Smily; diff --git a/src/net/java/sip/communicator/impl/gui/main/message/WriteMessagePanel.java b/src/net/java/sip/communicator/impl/gui/main/message/WriteMessagePanel.java index a5e87fd89..345e68e3d 100644 --- a/src/net/java/sip/communicator/impl/gui/main/message/WriteMessagePanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/message/WriteMessagePanel.java @@ -9,31 +9,23 @@ import java.awt.BasicStroke; import java.awt.BorderLayout; -import java.awt.Event; import java.awt.Graphics; import java.awt.Graphics2D; -import java.awt.event.ActionEvent; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; -import javax.swing.AbstractAction; -import javax.swing.Action; import javax.swing.BorderFactory; -import javax.swing.InputMap; import javax.swing.JEditorPane; -import javax.swing.JPanel; import javax.swing.JScrollPane; -import javax.swing.KeyStroke; import javax.swing.event.UndoableEditEvent; import javax.swing.event.UndoableEditListener; -import javax.swing.text.DefaultEditorKit; import javax.swing.undo.CannotRedoException; import javax.swing.undo.CannotUndoException; import javax.swing.undo.UndoManager; import net.java.sip.communicator.impl.gui.main.customcontrols.AntialiasedEditorPane; -import net.java.sip.communicator.impl.gui.main.utils.Constants; import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.main.utils.Constants; public class WriteMessagePanel extends JScrollPane implements UndoableEditListener { diff --git a/src/net/java/sip/communicator/impl/gui/main/message/menu/EditMenu.java b/src/net/java/sip/communicator/impl/gui/main/message/menu/EditMenu.java index a0d99727b..b8a3d7ae5 100644 --- a/src/net/java/sip/communicator/impl/gui/main/message/menu/EditMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/message/menu/EditMenu.java @@ -11,13 +11,11 @@ import javax.swing.ImageIcon; import javax.swing.JMenu; -import javax.swing.JMenuItem; -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.customcontrols.AntialiasedMenuItem; import net.java.sip.communicator.impl.gui.main.i18n.Messages; import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; public class EditMenu extends JMenu { diff --git a/src/net/java/sip/communicator/impl/gui/main/message/menu/FileMenu.java b/src/net/java/sip/communicator/impl/gui/main/message/menu/FileMenu.java index 3d85f44ef..b71cbdb17 100644 --- a/src/net/java/sip/communicator/impl/gui/main/message/menu/FileMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/message/menu/FileMenu.java @@ -12,16 +12,14 @@ import java.awt.event.ActionListener; import javax.swing.ImageIcon; -import javax.swing.JFrame; import javax.swing.JMenu; import javax.swing.JMenuItem; -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.customcontrols.AntialiasedMenuItem; import net.java.sip.communicator.impl.gui.main.i18n.Messages; import net.java.sip.communicator.impl.gui.main.message.MessageWindow; import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; public class FileMenu extends JMenu implements ActionListener{ diff --git a/src/net/java/sip/communicator/impl/gui/main/message/toolBars/EditTextToolBar.java b/src/net/java/sip/communicator/impl/gui/main/message/toolBars/EditTextToolBar.java index 360093fb4..f4bdb0050 100644 --- a/src/net/java/sip/communicator/impl/gui/main/message/toolBars/EditTextToolBar.java +++ b/src/net/java/sip/communicator/impl/gui/main/message/toolBars/EditTextToolBar.java @@ -12,12 +12,10 @@ import javax.swing.BorderFactory; import javax.swing.JComboBox; -import javax.swing.JToolBar; -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.customcontrols.SIPCommButton; import net.java.sip.communicator.impl.gui.main.customcontrols.SIPCommToolBar; +import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; public class EditTextToolBar extends SIPCommToolBar { diff --git a/src/net/java/sip/communicator/impl/gui/main/message/toolBars/MainToolBar.java b/src/net/java/sip/communicator/impl/gui/main/message/toolBars/MainToolBar.java index d1ff815c3..90f461c94 100644 --- a/src/net/java/sip/communicator/impl/gui/main/message/toolBars/MainToolBar.java +++ b/src/net/java/sip/communicator/impl/gui/main/message/toolBars/MainToolBar.java @@ -16,7 +16,6 @@ import javax.swing.ImageIcon; import javax.swing.JEditorPane; import javax.swing.JLabel; -import javax.swing.JToolBar; import net.java.sip.communicator.impl.gui.main.customcontrols.MsgToolbarButton; import net.java.sip.communicator.impl.gui.main.customcontrols.SIPCommButton; @@ -24,7 +23,6 @@ import net.java.sip.communicator.impl.gui.main.history.HistoryWindow; import net.java.sip.communicator.impl.gui.main.message.MessageWindow; import net.java.sip.communicator.impl.gui.main.message.SmiliesSelectorBox; -import net.java.sip.communicator.impl.gui.main.utils.Constants; import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; public class MainToolBar extends SIPCommToolBar diff --git a/src/net/java/sip/communicator/impl/gui/main/ui/SIPCommTreeUI.java b/src/net/java/sip/communicator/impl/gui/main/ui/SIPCommTreeUI.java index 1a982a3f7..e379e11b5 100644 --- a/src/net/java/sip/communicator/impl/gui/main/ui/SIPCommTreeUI.java +++ b/src/net/java/sip/communicator/impl/gui/main/ui/SIPCommTreeUI.java @@ -8,14 +8,9 @@ package net.java.sip.communicator.impl.gui.main.ui; import java.awt.Graphics; -import java.awt.Insets; -import java.awt.Rectangle; import javax.swing.JComponent; import javax.swing.plaf.basic.BasicTreeUI; -import javax.swing.tree.TreePath; - -import net.java.sip.communicator.impl.gui.main.utils.Constants; public class SIPCommTreeUI extends BasicTreeUI { diff --git a/src/net/java/sip/communicator/impl/gui/main/utils/Constants.java b/src/net/java/sip/communicator/impl/gui/main/utils/Constants.java index f870adfc0..5061662b8 100755 --- a/src/net/java/sip/communicator/impl/gui/main/utils/Constants.java +++ b/src/net/java/sip/communicator/impl/gui/main/utils/Constants.java @@ -10,16 +10,10 @@ import java.awt.Color; import java.awt.Font; import java.awt.Image; -import java.io.IOException; -import java.util.ArrayList; import java.util.Hashtable; import java.util.Map; -import javax.imageio.ImageIO; - -import net.java.sip.communicator.impl.gui.main.customcontrols.StatusIcon; import net.java.sip.communicator.service.protocol.icqconstants.IcqStatusEnum; -import net.java.sip.communicator.util.Logger; /** * @author Yana Stamcheva diff --git a/src/net/java/sip/communicator/impl/gui/main/utils/ImageLoader.java b/src/net/java/sip/communicator/impl/gui/main/utils/ImageLoader.java index ad63683f9..b44d2f6a9 100644 --- a/src/net/java/sip/communicator/impl/gui/main/utils/ImageLoader.java +++ b/src/net/java/sip/communicator/impl/gui/main/utils/ImageLoader.java @@ -9,9 +9,7 @@ import java.awt.Image; import java.awt.image.BufferedImage; -import java.io.File; import java.io.IOException; -import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; import java.util.Iterator;