Fixes warnings about unused imports.

88 files changed, 47 insertions, 166 deletions

diff --git a/src/net/java/sip/communicator/impl/growlnotification/GrowlNotificationServiceImpl.java b/src/net/java/sip/communicator/impl/growlnotification/GrowlNotificationServiceImpl.java
index 039a455..f673374 100644
--- a/src/net/java/sip/communicator/impl/growlnotification/GrowlNotificationServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/growlnotification/GrowlNotificationServiceImpl.java
@@ -6,15 +6,15 @@
  */
 package net.java.sip.communicator.impl.growlnotification;
 
-import java.util.*;
+import java.lang.reflect.*;
 
 import org.osgi.framework.*;
+
 import com.growl.*;
+
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
-import java.lang.reflect.*;
-
 
 /**
  * The Growl Notification Service displays on-screen information such as
diff --git a/src/net/java/sip/communicator/impl/gui/PopupDialogImpl.java b/src/net/java/sip/communicator/impl/gui/PopupDialogImpl.java
index 1c36a52..3526d3a 100644
--- a/src/net/java/sip/communicator/impl/gui/PopupDialogImpl.java
+++ b/src/net/java/sip/communicator/impl/gui/PopupDialogImpl.java
@@ -8,7 +8,6 @@ package net.java.sip.communicator.impl.gui;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.service.gui.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java b/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
index 4b6f3b7..e2ae91d 100644
--- a/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
@@ -25,7 +25,6 @@ import net.java.sip.communicator.impl.gui.main.configforms.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.addcontact.*;
 import net.java.sip.communicator.impl.gui.main.login.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.service.configuration.event.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/ErrorDialog.java b/src/net/java/sip/communicator/impl/gui/customcontrols/ErrorDialog.java
index b87debb..0350f07 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/ErrorDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/ErrorDialog.java
@@ -15,7 +15,6 @@ import javax.swing.event.*;
 
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.lookandfeel.*;
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/SCScrollPane.java b/src/net/java/sip/communicator/impl/gui/customcontrols/SCScrollPane.java
index 35bcf20..4672768 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/SCScrollPane.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/SCScrollPane.java
@@ -12,7 +12,6 @@ import java.awt.image.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.swing.*;
 
 public class SCScrollPane
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java b/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java
index 1b1d811..378a3cd 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java
@@ -14,7 +14,6 @@ import java.util.*;
 import javax.swing.*;
 import javax.swing.border.*;
 
-import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.swing.*;
diff --git a/src/net/java/sip/communicator/impl/gui/event/PluginComponentEvent.java b/src/net/java/sip/communicator/impl/gui/event/PluginComponentEvent.java
index 771d4c6..3063875 100644
--- a/src/net/java/sip/communicator/impl/gui/event/PluginComponentEvent.java
+++ b/src/net/java/sip/communicator/impl/gui/event/PluginComponentEvent.java
@@ -6,11 +6,9 @@
  */
 package net.java.sip.communicator.impl.gui.event;
 
-import java.awt.*;
 import java.util.*;
 
 import net.java.sip.communicator.service.gui.*;
-import net.java.sip.communicator.service.gui.Container;
 
 /**
  * The <tt>PluginComponentEvent</tt> 
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommButtonUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommButtonUI.java
index 404e77f..ae11fe1 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommButtonUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommButtonUI.java
@@ -12,7 +12,6 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.metal.*;
 
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.swing.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommChatSelectorMenuUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommChatSelectorMenuUI.java
index 1d1778d..776df07 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommChatSelectorMenuUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommChatSelectorMenuUI.java
@@ -13,7 +13,6 @@ import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.swing.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSelectorMenuUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSelectorMenuUI.java
index 31cf18f..56c2aff 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSelectorMenuUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSelectorMenuUI.java
@@ -12,7 +12,6 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.swing.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSplitPaneDivider.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSplitPaneDivider.java
index 5224091..b664de5 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSplitPaneDivider.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSplitPaneDivider.java
@@ -14,7 +14,6 @@ import javax.swing.border.*;
 import javax.swing.plaf.basic.*;
 import javax.swing.plaf.metal.*;
 
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.swing.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextFieldUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextFieldUI.java
index 9904e8f..48849a3 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextFieldUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextFieldUI.java
@@ -14,7 +14,6 @@ import javax.swing.plaf.metal.*;
 import javax.swing.text.*;
 
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.swing.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToggleButtonUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToggleButtonUI.java
index bd33f59..10aa8b9 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToggleButtonUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToggleButtonUI.java
@@ -12,7 +12,6 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.swing.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/account/NewAccountDialog.java b/src/net/java/sip/communicator/impl/gui/main/account/NewAccountDialog.java
index 280f2a6..39d44c4 100644
--- a/src/net/java/sip/communicator/impl/gui/main/account/NewAccountDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/account/NewAccountDialog.java
@@ -12,9 +12,7 @@ import java.util.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.swing.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java b/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java
index 91995b0..1d11fb1 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java
@@ -15,7 +15,6 @@ import javax.swing.*;
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.swing.*;
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java
index 790bd4b..7c8ac83 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java
@@ -14,7 +14,6 @@ import javax.swing.Timer;
 
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.impl.media.keyshare.KeyProviderAlgorithm;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.swing.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/MainCallPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/MainCallPanel.java
index f272b59..f5a2fbd 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/MainCallPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/MainCallPanel.java
@@ -18,7 +18,6 @@ import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.event.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/ReceivedCallDialog.java b/src/net/java/sip/communicator/impl/gui/main/call/ReceivedCallDialog.java
index 04bb687..b1f81e2 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/ReceivedCallDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/ReceivedCallDialog.java
@@ -14,7 +14,6 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/SmiliesSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/chat/SmiliesSelectorBox.java
index 1b5630e..e69fe05 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/SmiliesSelectorBox.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/SmiliesSelectorBox.java
@@ -13,7 +13,6 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.swing.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatInviteDialog.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatInviteDialog.java
index 3687ce3..9c85c54 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatInviteDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatInviteDialog.java
@@ -13,7 +13,6 @@ import java.util.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.lookandfeel.*;
 import net.java.sip.communicator.impl.gui.main.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomMemberListPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomMemberListPanel.java
index a6b44ae..2ed77bd 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomMemberListPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomMemberListPanel.java
@@ -4,19 +4,16 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.impl.gui.main.chat.conference;
 
 import java.awt.*;
 import java.awt.event.*;
 
 import javax.swing.*;
-import javax.swing.event.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.*;
-import net.java.sip.communicator.service.contactlist.*;
 
 /**
  * The <tt>ChatContactListPanel</tt> is the panel added on the right of the
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/InvitationReceivedDialog.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/InvitationReceivedDialog.java
index 84073a1..320ac33 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/InvitationReceivedDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/InvitationReceivedDialog.java
@@ -12,7 +12,6 @@ import java.awt.event.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java b/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java
index e3543da..3b2942e 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java
@@ -17,7 +17,6 @@ import javax.swing.text.*;
 import javax.swing.text.html.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/history/SearchPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/history/SearchPanel.java
index 63a82b0..3e06191 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/history/SearchPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/history/SearchPanel.java
@@ -13,7 +13,6 @@ import javax.swing.*;
 import javax.swing.event.*;
 
 import net.java.sip.communicator.impl.gui.i18n.*;
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.swing.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/menus/FileMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/menus/FileMenu.java
index 1ee5233..1f8529a 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/menus/FileMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/menus/FileMenu.java
@@ -16,7 +16,6 @@ import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.*;
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.swing.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/EditTextToolBar.java b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/EditTextToolBar.java
index 2527e8e..059a59d 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/EditTextToolBar.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/EditTextToolBar.java
@@ -16,7 +16,6 @@ import javax.swing.text.html.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java
index e0f614f..045f869 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java
@@ -13,13 +13,11 @@ import java.awt.image.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.event.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
 import net.java.sip.communicator.impl.gui.main.chat.history.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.addcontact.*;
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java
index b37dd60..8f255c0 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java
@@ -18,7 +18,6 @@ import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.main.chat.history.*;
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
 import net.java.sip.communicator.service.protocol.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomListDialog.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomListDialog.java
index dcc4107..d9e7945 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomListDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomListDialog.java
@@ -11,7 +11,6 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.createforms.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomWizard.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomWizard.java
index 1562241..0e8624d 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomWizard.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomWizard.java
@@ -9,12 +9,10 @@ package net.java.sip.communicator.impl.gui.main.chatroomslist.joinforms;
 import java.util.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.customcontrols.wizard.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
-import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactTooltip.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactTooltip.java
index c12158a..c12227c 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactTooltip.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactTooltip.java
@@ -11,7 +11,6 @@ import java.awt.*;
 import javax.swing.*;
 import javax.swing.plaf.metal.*;
 
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactDialog.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactDialog.java
index 6b30ede..626d353 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactDialog.java
@@ -11,7 +11,6 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.service.contactlist.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupDialog.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupDialog.java
index 4ec801c..6adc803 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupDialog.java
@@ -11,7 +11,6 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.service.contactlist.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizardExportedWindow.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizardExportedWindow.java
index 6d667f7..7f67d0e 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizardExportedWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizardExportedWindow.java
@@ -6,8 +6,6 @@
  */
 package net.java.sip.communicator.impl.gui.main.contactlist.addcontact;
 
-import java.awt.Window;
-
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.service.gui.*;
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizardPage2.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizardPage2.java
index 671dd82..b69c615 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizardPage2.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizardPage2.java
@@ -11,7 +11,6 @@ import java.util.*;
 
 import javax.swing.event.*;
 
-import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.gui.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectAccountPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectAccountPanel.java
index 7c426bf..c2b4a7c 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectAccountPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectAccountPanel.java
@@ -19,7 +19,6 @@ import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.account.*;
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.impl.gui.utils.Constants;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.swing.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupDialog.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupDialog.java
index 1599928..71dc714 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupDialog.java
@@ -11,7 +11,6 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.service.contactlist.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/HelpMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/HelpMenu.java
index c17f61e..2fbb2dc 100644
--- a/src/net/java/sip/communicator/impl/gui/main/menus/HelpMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/menus/HelpMenu.java
@@ -8,14 +8,12 @@ package net.java.sip.communicator.impl.gui.main.menus;
 
 import java.awt.*;
 import java.awt.event.*;
-import java.util.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.event.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
 import net.java.sip.communicator.util.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/message/NewStatusMessageDialog.java b/src/net/java/sip/communicator/impl/gui/main/presence/message/NewStatusMessageDialog.java
index dcd3bb7..eccac75 100644
--- a/src/net/java/sip/communicator/impl/gui/main/presence/message/NewStatusMessageDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/message/NewStatusMessageDialog.java
@@ -11,9 +11,7 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
diff --git a/src/net/java/sip/communicator/impl/gui/utils/SoundProperties.java b/src/net/java/sip/communicator/impl/gui/utils/SoundProperties.java
index ffe15c2..ba4ecd9 100644
--- a/src/net/java/sip/communicator/impl/gui/utils/SoundProperties.java
+++ b/src/net/java/sip/communicator/impl/gui/utils/SoundProperties.java
@@ -4,11 +4,8 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.impl.gui.utils;
 
-import java.util.*;
-
 import net.java.sip.communicator.impl.gui.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/media/codec/audio/ilbc/bitpack.java b/src/net/java/sip/communicator/impl/media/codec/audio/ilbc/bitpack.java
index ad08a5c..978c087 100644
--- a/src/net/java/sip/communicator/impl/media/codec/audio/ilbc/bitpack.java
+++ b/src/net/java/sip/communicator/impl/media/codec/audio/ilbc/bitpack.java
@@ -6,8 +6,6 @@
  */
 package net.java.sip.communicator.impl.media.codec.audio.ilbc;
 
-import java.lang.*;
-
 /**
  * @author Jean Lorchat
  */
diff --git a/src/net/java/sip/communicator/impl/media/codec/audio/ilbc/bitstream.java b/src/net/java/sip/communicator/impl/media/codec/audio/ilbc/bitstream.java
index 2458496..f9cca34 100644
--- a/src/net/java/sip/communicator/impl/media/codec/audio/ilbc/bitstream.java
+++ b/src/net/java/sip/communicator/impl/media/codec/audio/ilbc/bitstream.java
@@ -6,8 +6,6 @@
  */
 package net.java.sip.communicator.impl.media.codec.audio.ilbc;
 
-import java.lang.*;
-
 /**
  * @author Jean Lorchat
  */
diff --git a/src/net/java/sip/communicator/impl/media/codec/audio/ilbc/ilbc_common.java b/src/net/java/sip/communicator/impl/media/codec/audio/ilbc/ilbc_common.java
index 5a13416..4812d1f 100644
--- a/src/net/java/sip/communicator/impl/media/codec/audio/ilbc/ilbc_common.java
+++ b/src/net/java/sip/communicator/impl/media/codec/audio/ilbc/ilbc_common.java
@@ -6,8 +6,6 @@
  */
 package net.java.sip.communicator.impl.media.codec.audio.ilbc;
 
-import java.lang.*;
-
 /**
  * @author Jean Lorchat
  */
diff --git a/src/net/java/sip/communicator/impl/media/codec/audio/ilbc/ilbc_decoder.java b/src/net/java/sip/communicator/impl/media/codec/audio/ilbc/ilbc_decoder.java
index 79973b1..31233e5 100644
--- a/src/net/java/sip/communicator/impl/media/codec/audio/ilbc/ilbc_decoder.java
+++ b/src/net/java/sip/communicator/impl/media/codec/audio/ilbc/ilbc_decoder.java
@@ -6,8 +6,6 @@
  */
 package net.java.sip.communicator.impl.media.codec.audio.ilbc;
 
-import java.lang.*;
-
 /**
  * @author Jean Lorchat
  */
diff --git a/src/net/java/sip/communicator/impl/media/codec/audio/ilbc/ilbc_encoder.java b/src/net/java/sip/communicator/impl/media/codec/audio/ilbc/ilbc_encoder.java
index fdd2f1f..508d319 100644
--- a/src/net/java/sip/communicator/impl/media/codec/audio/ilbc/ilbc_encoder.java
+++ b/src/net/java/sip/communicator/impl/media/codec/audio/ilbc/ilbc_encoder.java
@@ -6,8 +6,6 @@
  */
 package net.java.sip.communicator.impl.media.codec.audio.ilbc;
 
-import java.lang.*;
-
 /**
  * @author Jean Lorchat
  */
diff --git a/src/net/java/sip/communicator/impl/media/codec/audio/ilbc/ilbc_ulp.java b/src/net/java/sip/communicator/impl/media/codec/audio/ilbc/ilbc_ulp.java
index 39fa09a..2e59d81 100644
--- a/src/net/java/sip/communicator/impl/media/codec/audio/ilbc/ilbc_ulp.java
+++ b/src/net/java/sip/communicator/impl/media/codec/audio/ilbc/ilbc_ulp.java
@@ -6,8 +6,6 @@
  */
 package net.java.sip.communicator.impl.media.codec.audio.ilbc;
 
-import java.lang.*;
-
 /**
  * @author Jean Lorchat
  */
diff --git a/src/net/java/sip/communicator/impl/media/device/ConfigurationListener.java b/src/net/java/sip/communicator/impl/media/device/ConfigurationListener.java
index 0238393..2eaf025 100644
--- a/src/net/java/sip/communicator/impl/media/device/ConfigurationListener.java
+++ b/src/net/java/sip/communicator/impl/media/device/ConfigurationListener.java
@@ -6,10 +6,8 @@
  */
 package net.java.sip.communicator.impl.media.device;
 
-import net.java.sip.communicator.service.configuration.event.*;
 import net.java.sip.communicator.util.*;
 
-
 /**
  *
  * @author Martin Andre
diff --git a/src/net/java/sip/communicator/impl/media/device/V4LAuto.java b/src/net/java/sip/communicator/impl/media/device/V4LAuto.java
index 7c910b6..1f172f1 100644
--- a/src/net/java/sip/communicator/impl/media/device/V4LAuto.java
+++ b/src/net/java/sip/communicator/impl/media/device/V4LAuto.java
@@ -11,11 +11,12 @@
 package net.java.sip.communicator.impl.media.device;
 
 import java.util.*;
+
 import javax.media.*;
 
 import net.java.sip.communicator.util.*;
+
 import com.sun.media.protocol.v4l.*;
-import java.io.*;
 
 /**
  * Probes for video capture devices present on linux systems.
diff --git a/src/net/java/sip/communicator/impl/media/keyshare/DummyKeyProvider.java b/src/net/java/sip/communicator/impl/media/keyshare/DummyKeyProvider.java
index 5451e3a..0c099d2 100644
--- a/src/net/java/sip/communicator/impl/media/keyshare/DummyKeyProvider.java
+++ b/src/net/java/sip/communicator/impl/media/keyshare/DummyKeyProvider.java
@@ -6,8 +6,6 @@
  */
 package net.java.sip.communicator.impl.media.keyshare;
 
-import net.java.sip.communicator.impl.media.transform.srtp.*;
-
 /**
  * DummyProvider class implements KeyProvider interface.
  * Used only for testing - activates the hardcoded keys behaviour for SRTP traffic.
diff --git a/src/net/java/sip/communicator/impl/media/transform/TransformManager.java b/src/net/java/sip/communicator/impl/media/transform/TransformManager.java
index 62a8472..b8e5942 100755
--- a/src/net/java/sip/communicator/impl/media/transform/TransformManager.java
+++ b/src/net/java/sip/communicator/impl/media/transform/TransformManager.java
@@ -6,17 +6,15 @@
  */

 package net.java.sip.communicator.impl.media.transform;

 

-import javax.media.rtp.*;

 import java.security.*;

+import java.util.*;

+

+import javax.media.rtp.*;

 

 import net.java.sip.communicator.impl.media.transform.dummy.*;

 import net.java.sip.communicator.impl.media.transform.srtp.*;

 import net.java.sip.communicator.impl.media.transform.zrtp.*;

-import net.java.sip.communicator.impl.media.keyshare.*;

 import net.java.sip.communicator.service.media.*;

-import java.util.*;

-

-import org.bouncycastle.jce.provider.*;

 

 /**

  * TransformManager class encapsulate the logic of creating different kinds of

diff --git a/src/net/java/sip/communicator/impl/media/transform/srtp/SRTPCryptoContext.java b/src/net/java/sip/communicator/impl/media/transform/srtp/SRTPCryptoContext.java
index e23b857..8648e37 100755
--- a/src/net/java/sip/communicator/impl/media/transform/srtp/SRTPCryptoContext.java
+++ b/src/net/java/sip/communicator/impl/media/transform/srtp/SRTPCryptoContext.java
@@ -26,12 +26,12 @@
 */

 package net.java.sip.communicator.impl.media.transform.srtp;

 

-import java.util.*;

-

-import net.java.sip.communicator.impl.media.transform.*;

 import java.security.*;

-import javax.crypto.spec.*;

+

 import javax.crypto.*;

+import javax.crypto.spec.*;

+

+import net.java.sip.communicator.impl.media.transform.*;

 

 /**

  * SRTPCryptoContext class is the core class of SRTP implementation.

diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java
index 71f9ac3..d6060ae 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java
@@ -14,13 +14,12 @@ import org.jivesoftware.smackx.jingle.*;
 import org.jivesoftware.smackx.jingle.media.*;
 import org.jivesoftware.smackx.jingle.listeners.*;
 import org.jivesoftware.smackx.jingle.nat.*;
+import org.jivesoftware.smackx.packet.DiscoverInfo;
 
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.protocol.OperationSetBasicTelephony.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.impl.protocol.jabber.mediamgr.*;
-import org.jivesoftware.smackx.packet.DiscoverInfo;
 
 /**
  * Implements all call management logic and exports basic telephony support by
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/geolocation/GeolocationJabberUtils.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/geolocation/GeolocationJabberUtils.java
index 47f2167..4ba227c 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/geolocation/GeolocationJabberUtils.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/geolocation/GeolocationJabberUtils.java
@@ -11,11 +11,8 @@ import java.util.*;
 import java.util.Map.*;
 
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.protocol.jabberconstants.*;
 import net.java.sip.communicator.util.*;
 
-import org.jivesoftware.smack.packet.*;
-
 /**
  * This class give some static methods for converting a geolocation message
  * to a different format.
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/geolocation/GeolocationPresence.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/geolocation/GeolocationPresence.java
index 5277e4c..00f1e8e 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/geolocation/GeolocationPresence.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/geolocation/GeolocationPresence.java
@@ -7,7 +7,6 @@
 package net.java.sip.communicator.impl.protocol.jabber.extensions.geolocation;
 
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.protocol.jabberconstants.*;
 
 import org.jivesoftware.smack.packet.*;
 import net.java.sip.communicator.impl.protocol.jabber.*;
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/keepalive/KeepAliveEvent.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/keepalive/KeepAliveEvent.java
index 4487854..ea7ac6a 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/keepalive/KeepAliveEvent.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/keepalive/KeepAliveEvent.java
@@ -8,7 +8,6 @@ package net.java.sip.communicator.impl.protocol.jabber.extensions.keepalive;
 
 import org.jivesoftware.smack.packet.*;
 import org.jivesoftware.smack.util.*;
-import net.java.sip.communicator.impl.protocol.jabber.extensions.*;
 
 /**
  * KeepAlive Event. Events are send on specified interval
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/mediamgr/AudioMediaSession.java b/src/net/java/sip/communicator/impl/protocol/jabber/mediamgr/AudioMediaSession.java
index 7440fa5..63dc768 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/mediamgr/AudioMediaSession.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/mediamgr/AudioMediaSession.java
@@ -4,22 +4,19 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.impl.protocol.jabber.mediamgr;
 
-import net.java.sip.communicator.util.*;
+import java.util.*;
+
+import net.java.sip.communicator.impl.protocol.jabber.*;
 import net.java.sip.communicator.service.media.*;
 import net.java.sip.communicator.service.media.event.*;
-import net.java.sip.communicator.impl.protocol.jabber.*;
+import net.java.sip.communicator.util.*;
 
 import org.jivesoftware.smackx.jingle.*;
 import org.jivesoftware.smackx.jingle.media.*;
 import org.jivesoftware.smackx.jingle.nat.*;
 
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
 /**
  * This Class implements a JingleMediaSession. which serve as a wrapper
  * for a RtpFlow, allowing us to receive and transmit audio.
diff --git a/src/net/java/sip/communicator/impl/protocol/msn/EventManager.java b/src/net/java/sip/communicator/impl/protocol/msn/EventManager.java
index a9c0ef6..7714c92 100644
--- a/src/net/java/sip/communicator/impl/protocol/msn/EventManager.java
+++ b/src/net/java/sip/communicator/impl/protocol/msn/EventManager.java
@@ -11,12 +11,12 @@ import java.util.*;
 import net.sf.jml.*;
 import net.sf.jml.impl.*;
 import net.sf.jml.net.*;
+import net.sf.jml.net.Message;
 import net.sf.jml.protocol.*;
 import net.sf.jml.protocol.incoming.*;
+
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.protocol.event.*;
-import net.sf.jml.net.Message;
 
 
 /**
diff --git a/src/net/java/sip/communicator/impl/protocol/rss/ContactRssImpl.java b/src/net/java/sip/communicator/impl/protocol/rss/ContactRssImpl.java
index 7d4cca6..626256c 100644
--- a/src/net/java/sip/communicator/impl/protocol/rss/ContactRssImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/rss/ContactRssImpl.java
@@ -6,19 +6,12 @@
  */
 package net.java.sip.communicator.impl.protocol.rss;
 
-import java.awt.*;
-import java.awt.image.*;
 import java.io.*;
 import java.net.*;
-import java.util.*;
-
-import javax.imageio.*;
 
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
-import com.ctreber.aclib.image.ico.*;
-
 /**
  * An implementation of a rss Contact.
  *
diff --git a/src/net/java/sip/communicator/impl/protocol/rss/RssFeedReader.java b/src/net/java/sip/communicator/impl/protocol/rss/RssFeedReader.java
index 79faf69..046eb53 100644
--- a/src/net/java/sip/communicator/impl/protocol/rss/RssFeedReader.java
+++ b/src/net/java/sip/communicator/impl/protocol/rss/RssFeedReader.java
@@ -6,16 +6,15 @@
  */
 package net.java.sip.communicator.impl.protocol.rss;
 
+import java.io.*;
 import java.net.*;
 import java.util.*;
-import java.text.*;
-import java.io.*;
 
 import com.sun.syndication.feed.synd.*;
 import com.sun.syndication.io.*;
 
-import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.util.*;
 
 /**
  * Wrapper class for the ROME functionality used in the RSS implementation in
diff --git a/src/net/java/sip/communicator/impl/protocol/rss/RssThread.java b/src/net/java/sip/communicator/impl/protocol/rss/RssThread.java
index b498a33..a97e58a 100644
--- a/src/net/java/sip/communicator/impl/protocol/rss/RssThread.java
+++ b/src/net/java/sip/communicator/impl/protocol/rss/RssThread.java
@@ -6,10 +6,6 @@
  */
 package net.java.sip.communicator.impl.protocol.rss;
 
-import java.util.*;
-import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.protocol.event.*;
-
 /**
  * Instant messaging functionalites for the Rss protocol.
  *
diff --git a/src/net/java/sip/communicator/impl/protocol/rss/UriHandlerRssImpl.java b/src/net/java/sip/communicator/impl/protocol/rss/UriHandlerRssImpl.java
index bbe04c0..6a9cc12 100644
--- a/src/net/java/sip/communicator/impl/protocol/rss/UriHandlerRssImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/rss/UriHandlerRssImpl.java
@@ -6,7 +6,6 @@
  */
 package net.java.sip.communicator.impl.protocol.rss;
 
-import java.text.*;
 import java.util.*;
 
 import org.osgi.framework.*;
@@ -14,7 +13,6 @@ import org.osgi.framework.*;
 import net.java.sip.communicator.service.argdelegation.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicInstantMessagingSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicInstantMessagingSipImpl.java
index 6a8510a..a8fef38 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicInstantMessagingSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicInstantMessagingSipImpl.java
@@ -7,9 +7,9 @@
 package net.java.sip.communicator.impl.protocol.sip;
 
 import java.io.*;
-import java.net.*;
 import java.text.*;
 import java.util.*;
+
 import javax.sip.*;
 import javax.sip.address.*;
 import javax.sip.header.*;
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java
index fba505e..c284350 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java
@@ -12,6 +12,7 @@ import gov.nist.javax.sip.header.extensions.*;
 import java.net.*;
 import java.text.*;
 import java.util.*;
+
 import javax.sip.*;
 import javax.sip.address.*;
 import javax.sip.header.*;
@@ -19,7 +20,6 @@ import javax.sip.message.*;
 
 import net.java.sip.communicator.service.media.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.protocol.OperationSetSecureTelephony.SecureStatusChangeSource;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetPresenceSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetPresenceSipImpl.java
index c5179fc..4f794fc 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetPresenceSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetPresenceSipImpl.java
@@ -6,11 +6,10 @@
  */
 package net.java.sip.communicator.impl.protocol.sip;
 
-import java.net.*;
-import java.text.*;
-import java.util.*;
 import java.beans.PropertyChangeEvent;
 import java.io.*;
+import java.text.*;
+import java.util.*;
 
 import javax.sip.*;
 import javax.sip.address.*;
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/SipRegistrarlessConnection.java b/src/net/java/sip/communicator/impl/protocol/sip/SipRegistrarlessConnection.java
index 059e308..b780fd4 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/SipRegistrarlessConnection.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/SipRegistrarlessConnection.java
@@ -6,14 +6,7 @@
  */
 package net.java.sip.communicator.impl.protocol.sip;
 
-import java.net.*;
-import java.text.*;
-import java.util.*;
-import java.util.logging.Level;
 import javax.sip.*;
-import javax.sip.address.*;
-import javax.sip.header.*;
-import javax.sip.message.*;
 
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/security/CredentialsCache.java b/src/net/java/sip/communicator/impl/protocol/sip/security/CredentialsCache.java
index 37a3abd..450cfd4 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/security/CredentialsCache.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/security/CredentialsCache.java
@@ -1,11 +1,14 @@
+/*
+ * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
 package net.java.sip.communicator.impl.protocol.sip.security;
 
 import java.util.*;
 
-import javax.sip.*;
 import javax.sip.header.*;
-import javax.sip.address.*;
-import javax.sip.message.*;
 
 /**
  * The class is used to cache all realms that a certain call has been authorized
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/security/CredentialsCacheEntry.java b/src/net/java/sip/communicator/impl/protocol/sip/security/CredentialsCacheEntry.java
index e030a6d..5e0778a 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/security/CredentialsCacheEntry.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/security/CredentialsCacheEntry.java
@@ -6,8 +6,8 @@
  */
 package net.java.sip.communicator.impl.protocol.sip.security;
 
-import javax.sip.header.AuthorizationHeader;
 import java.util.Vector;
+
 import net.java.sip.communicator.service.protocol.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/security/SipSecurityManager.java b/src/net/java/sip/communicator/impl/protocol/sip/security/SipSecurityManager.java
index 73e7956..af25229 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/security/SipSecurityManager.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/security/SipSecurityManager.java
@@ -8,14 +8,13 @@ package net.java.sip.communicator.impl.protocol.sip.security;
 
 import java.text.*;
 import java.util.*;
+
 import javax.sip.*;
 import javax.sip.header.*;
 import javax.sip.message.*;
 
-import net.java.sip.communicator.impl.netaddr.*;
 import net.java.sip.communicator.impl.protocol.sip.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/ContactSSH.java b/src/net/java/sip/communicator/impl/protocol/ssh/ContactSSH.java
index 20c45d0..d789176 100644
--- a/src/net/java/sip/communicator/impl/protocol/ssh/ContactSSH.java
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/ContactSSH.java
@@ -9,14 +9,12 @@
  * SSH Suport in SIP Communicator - GSoC' 07 Project
  *
  */
-
 package net.java.sip.communicator.impl.protocol.ssh;
 
 import java.io.*;
 import com.jcraft.jsch.*;
 
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.util.*;
 
 /**
  * This interface represents a Contact of SSH Type
diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/ContactSSHImpl.java b/src/net/java/sip/communicator/impl/protocol/ssh/ContactSSHImpl.java
index 55d5f73..654201c 100644
--- a/src/net/java/sip/communicator/impl/protocol/ssh/ContactSSHImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/ContactSSHImpl.java
@@ -12,9 +12,10 @@
 package net.java.sip.communicator.impl.protocol.ssh;
 
 import com.jcraft.jsch.*;
+
 import java.io.*;
 import java.util.*;
-import net.java.sip.communicator.impl.protocol.ssh.*;
+
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.Logger;
diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/SSHFileTransferDaemon.java b/src/net/java/sip/communicator/impl/protocol/ssh/SSHFileTransferDaemon.java
index bcd3835..226c289 100644
--- a/src/net/java/sip/communicator/impl/protocol/ssh/SSHFileTransferDaemon.java
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/SSHFileTransferDaemon.java
@@ -9,15 +9,14 @@
  * SSH Suport in SIP Communicator - GSoC' 07 Project
  *
  */
-
 package net.java.sip.communicator.impl.protocol.ssh;
 
 import java.io.*;
-import javax.swing.*;
+
 import com.jcraft.jsch.*;
 
-import net.java.sip.communicator.util.Logger;
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.util.Logger;
 
 /**
  *
diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/SSHReaderDaemon.java b/src/net/java/sip/communicator/impl/protocol/ssh/SSHReaderDaemon.java
index 371394b..6303768 100644
--- a/src/net/java/sip/communicator/impl/protocol/ssh/SSHReaderDaemon.java
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/SSHReaderDaemon.java
@@ -9,11 +9,9 @@
  * SSH Suport in SIP Communicator - GSoC' 07 Project
  *
  */
-
 package net.java.sip.communicator.impl.protocol.ssh;
 
 import java.io.*;
-import javax.swing.*;
 
 import net.java.sip.communicator.util.Logger;
 import net.java.sip.communicator.service.protocol.*;
diff --git a/src/net/java/sip/communicator/impl/protocol/zeroconf/ClientThread.java b/src/net/java/sip/communicator/impl/protocol/zeroconf/ClientThread.java
index 0aeb105..135f45f 100644
--- a/src/net/java/sip/communicator/impl/protocol/zeroconf/ClientThread.java
+++ b/src/net/java/sip/communicator/impl/protocol/zeroconf/ClientThread.java
@@ -8,7 +8,7 @@ package net.java.sip.communicator.impl.protocol.zeroconf;
 
 import java.io.*;
 import java.net.*;
-import java.util.*;
+
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
diff --git a/src/net/java/sip/communicator/impl/systray/jdic/ProviderRegistration.java b/src/net/java/sip/communicator/impl/systray/jdic/ProviderRegistration.java
index 100629d..3157ba9 100644
--- a/src/net/java/sip/communicator/impl/systray/jdic/ProviderRegistration.java
+++ b/src/net/java/sip/communicator/impl/systray/jdic/ProviderRegistration.java
@@ -8,7 +8,6 @@
 package net.java.sip.communicator.impl.systray.jdic;
 
 import net.java.sip.communicator.impl.systray.*;
-import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
diff --git a/src/net/java/sip/communicator/impl/version/VersionImpl.java b/src/net/java/sip/communicator/impl/version/VersionImpl.java
index de66f1d..cb0d19c 100644
--- a/src/net/java/sip/communicator/impl/version/VersionImpl.java
+++ b/src/net/java/sip/communicator/impl/version/VersionImpl.java
@@ -6,10 +6,9 @@
  */
 package net.java.sip.communicator.impl.version;
 
-import java.util.*;
-
-import net.java.sip.communicator.service.version.*;
 import net.java.sip.communicator.service.resources.*;
+import net.java.sip.communicator.service.version.*;
+
 import org.osgi.framework.ServiceReference;
 
 /**
diff --git a/src/net/java/sip/communicator/plugin/autoaway/StatusUpdateThread.java b/src/net/java/sip/communicator/plugin/autoaway/StatusUpdateThread.java
index 753eedd..1ca27c7 100644
--- a/src/net/java/sip/communicator/plugin/autoaway/StatusUpdateThread.java
+++ b/src/net/java/sip/communicator/plugin/autoaway/StatusUpdateThread.java
@@ -9,8 +9,6 @@ package net.java.sip.communicator.plugin.autoaway;
 import java.awt.*;

 import java.util.*;

 

-import javax.swing.text.Position;

-

 import net.java.sip.communicator.service.configuration.ConfigurationService;

 import net.java.sip.communicator.service.protocol.*;

 

diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationsTableEntry.java b/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationsTableEntry.java
index cfc0321..c13511e 100644
--- a/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationsTableEntry.java
+++ b/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationsTableEntry.java
@@ -6,8 +6,6 @@
  */
 package net.java.sip.communicator.plugin.notificationconfiguration;
 
-import net.java.sip.communicator.service.notification.event.*;
-
 /**
  * The <tt>NotificationsTableEntry</tt> is a class which defined the different 
  * entry in the utilitary "NotificationConfiguration" JTable. It 
diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/Resources.java b/src/net/java/sip/communicator/plugin/notificationconfiguration/Resources.java
index 6847767..04fea87 100644
--- a/src/net/java/sip/communicator/plugin/notificationconfiguration/Resources.java
+++ b/src/net/java/sip/communicator/plugin/notificationconfiguration/Resources.java
@@ -6,11 +6,8 @@
  */
 package net.java.sip.communicator.plugin.notificationconfiguration;
 
-import java.net.*;
 import java.util.*;
 
-import javax.swing.*;
-
 import net.java.sip.communicator.service.resources.*;
 
 /**
diff --git a/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java
index b779974..36511eb 100644
--- a/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java
@@ -10,7 +10,6 @@ import java.awt.*;
 import java.util.*;
 
 import org.osgi.framework.*;
-import net.java.sip.communicator.impl.gui.customcontrols.*;
 
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
diff --git a/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardSessionManager.java b/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardSessionManager.java
index 75c0bb3..43c1f19 100644
--- a/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardSessionManager.java
+++ b/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardSessionManager.java
@@ -11,7 +11,6 @@ import java.util.*;
 
 import net.java.sip.communicator.plugin.whiteboard.gui.*;
 import net.java.sip.communicator.plugin.whiteboard.gui.whiteboardshapes.*;
-import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
diff --git a/src/net/java/sip/communicator/service/protocol/OperationSetSecureTelephony.java b/src/net/java/sip/communicator/service/protocol/OperationSetSecureTelephony.java
index 80d9f06..31e4bd2 100644
--- a/src/net/java/sip/communicator/service/protocol/OperationSetSecureTelephony.java
+++ b/src/net/java/sip/communicator/service/protocol/OperationSetSecureTelephony.java
@@ -6,8 +6,6 @@
  */
 package net.java.sip.communicator.service.protocol;
 
-import net.java.sip.communicator.service.protocol.event.*;
-
 /**
  * An Operation Set defining the encryption operations for telephony.
  *
diff --git a/src/net/java/sip/communicator/service/protocol/WhiteboardPoint.java b/src/net/java/sip/communicator/service/protocol/WhiteboardPoint.java
index faaf809..409266c 100644
--- a/src/net/java/sip/communicator/service/protocol/WhiteboardPoint.java
+++ b/src/net/java/sip/communicator/service/protocol/WhiteboardPoint.java
@@ -6,8 +6,6 @@
  */
 package net.java.sip.communicator.service.protocol;
 
-import java.awt.geom.*;
-
 /**
  * A point representing a location in {@code (x,y)} coordinate space,
  * specified in integer precision.
diff --git a/src/net/java/sip/communicator/service/protocol/event/WhiteboardObjectDeletedEvent.java b/src/net/java/sip/communicator/service/protocol/event/WhiteboardObjectDeletedEvent.java
index 09b6b1d..838d67f 100644
--- a/src/net/java/sip/communicator/service/protocol/event/WhiteboardObjectDeletedEvent.java
+++ b/src/net/java/sip/communicator/service/protocol/event/WhiteboardObjectDeletedEvent.java
@@ -9,7 +9,6 @@ package net.java.sip.communicator.service.protocol.event;
 import java.util.*;
 
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.protocol.whiteboardobjects.WhiteboardObject;
 
 /**
  * <tt>WhiteboardObjectDeletedEvent</tt> indicates reception of a new
diff --git a/src/net/java/sip/communicator/util/IPAddressUtil.java b/src/net/java/sip/communicator/util/IPAddressUtil.java
index 30d27ca..ff308b5 100644
--- a/src/net/java/sip/communicator/util/IPAddressUtil.java
+++ b/src/net/java/sip/communicator/util/IPAddressUtil.java
@@ -32,8 +32,6 @@
  */
 package net.java.sip.communicator.util;
 
-import java.net.*;
-
 /**
  * Contains utility methods for work with IPv4 and IPv6 addresses.
  *
diff --git a/src/net/java/sip/communicator/util/UtilActivator.java b/src/net/java/sip/communicator/util/UtilActivator.java
index 9a7c551..b7f6a5d 100644
--- a/src/net/java/sip/communicator/util/UtilActivator.java
+++ b/src/net/java/sip/communicator/util/UtilActivator.java
@@ -6,7 +6,6 @@
  */
 package net.java.sip.communicator.util;
 
-import net.java.sip.communicator.plugin.extendedcallhistorysearch.*;
 import net.java.sip.communicator.service.resources.*;
 
 import org.osgi.framework.*;
diff --git a/src/net/java/sip/communicator/util/launchutils/SipCommunicatorLock.java b/src/net/java/sip/communicator/util/launchutils/SipCommunicatorLock.java
index ca588d9..579df9c 100644
--- a/src/net/java/sip/communicator/util/launchutils/SipCommunicatorLock.java
+++ b/src/net/java/sip/communicator/util/launchutils/SipCommunicatorLock.java
@@ -12,7 +12,6 @@ import java.util.*;
 
 import net.java.sip.communicator.launcher.*;
 import net.java.sip.communicator.util.*;
-import net.java.sip.communicator.util.launchutils.*;
 
 /**
  * This class is used to prevent from running multiple instances of SIP
diff --git a/test/net/java/sip/communicator/slick/protocol/jabber/JabberSlickFixture.java b/test/net/java/sip/communicator/slick/protocol/jabber/JabberSlickFixture.java
index 865eddf..86f78e9 100644
--- a/test/net/java/sip/communicator/slick/protocol/jabber/JabberSlickFixture.java
+++ b/test/net/java/sip/communicator/slick/protocol/jabber/JabberSlickFixture.java
@@ -6,13 +6,14 @@
  */
 package net.java.sip.communicator.slick.protocol.jabber;
 
+import java.util.*;
+import java.util.Map;
+
 import org.osgi.framework.*;
+
 import junit.framework.*;
+
 import net.java.sip.communicator.service.protocol.*;
-import java.util.Map;
-import java.util.*;
-import org.jivesoftware.smack.RosterGroup;
-import org.jivesoftware.smack.RosterEntry;
 
 /**
  * Contains fields and methods used by most or all tests in the Jabber slick.
diff --git a/test/net/java/sip/communicator/slick/slickless/SlicklessTests.java b/test/net/java/sip/communicator/slick/slickless/SlicklessTests.java
index fc54e7b..08d73cf 100644
--- a/test/net/java/sip/communicator/slick/slickless/SlicklessTests.java
+++ b/test/net/java/sip/communicator/slick/slickless/SlicklessTests.java
@@ -9,9 +9,9 @@ package net.java.sip.communicator.slick.slickless;
 import java.util.*;
 
 import org.osgi.framework.*;
+
 import junit.framework.*;
-import net.java.sip.communicator.slick.slickless.util.*;
-import net.java.sip.communicator.slick.slickless.util.xml.*;
+
 import net.java.sip.communicator.util.*;