optimize imports

cusax-fix
Yana Stamcheva 20 years ago
parent f7e1d1cb52
commit fd572097d5

@ -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)
}
/**

@ -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
{

@ -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;
/**

@ -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{

@ -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();

@ -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;

@ -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;

@ -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

@ -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 {

@ -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;

@ -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;

@ -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;

@ -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;

@ -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

@ -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) {

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;
/**

@ -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;

@ -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;

@ -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 {

@ -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 {

@ -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 {

@ -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)){

@ -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);

@ -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;

@ -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;

@ -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 {

@ -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 {

@ -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{

@ -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 {

@ -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

@ -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 {

@ -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

@ -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;

Loading…
Cancel
Save