Switches Jitsi trunk to libjitsi.

537 files changed, 1169 insertions, 919 deletions

diff --git a/.classpath b/.classpath
index 26c7755..11d86b1 100644
--- a/.classpath
+++ b/.classpath
@@ -32,7 +32,6 @@
 	<classpathentry kind="lib" path="lib/installer-exclude/jsch-0.1.36.jar"/>

 	<classpathentry kind="lib" path="lib/installer-exclude/jsocks-klea.jar"/>

 	<classpathentry kind="lib" path="lib/installer-exclude/json-20090723.jar"/>

-	<classpathentry kind="lib" path="lib/installer-exclude/jspeex.jar"/>

 	<classpathentry kind="lib" path="lib/installer-exclude/junit.jar"/>

 	<classpathentry kind="lib" path="lib/installer-exclude/laf-widget.jar"/>

 	<classpathentry kind="lib" path="lib/installer-exclude/libphonenumber-2.4.jar"/>

diff --git a/build.xml b/build.xml
index dfc6a8e..3245110 100644
--- a/build.xml
+++ b/build.xml
@@ -1020,8 +1020,6 @@
         <jar compress="false" destfile="${bundles.dest}/fileaccess.jar"
             manifest="${src}/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf">
 
-            <zipfileset dir="${dest}/net/java/sip/communicator/service/fileaccess"
-                prefix="net/java/sip/communicator/service/fileaccess"/>
             <zipfileset dir="${dest}/net/java/sip/communicator/impl/fileaccess"
                 prefix="net/java/sip/communicator/impl/fileaccess" />
         </jar>
diff --git a/lib/installer-exclude/jspeex.jar b/lib/installer-exclude/jspeex.jar
deleted file mode 100644
index 894257f..0000000
--- a/lib/installer-exclude/jspeex.jar
+++ /dev/null
diff --git a/lib/installer-exclude/libjitsi.jar b/lib/installer-exclude/libjitsi.jar
index de260e2..7f12c17 100644
--- a/lib/installer-exclude/libjitsi.jar
+++ b/lib/installer-exclude/libjitsi.jar
diff --git a/src/net/java/sip/communicator/impl/argdelegation/ArgDelegationPeerImpl.java b/src/net/java/sip/communicator/impl/argdelegation/ArgDelegationPeerImpl.java
index a831165..5a5f0e2 100644
--- a/src/net/java/sip/communicator/impl/argdelegation/ArgDelegationPeerImpl.java
+++ b/src/net/java/sip/communicator/impl/argdelegation/ArgDelegationPeerImpl.java
@@ -8,13 +8,13 @@ package net.java.sip.communicator.impl.argdelegation;
 
 import java.util.*;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.argdelegation.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.launchutils.*;
 
+import org.osgi.framework.*;
+
 /**
  * Implements the <tt>UriDelegationPeer</tt> interface from our argument handler
  * utility. We use this handler to relay arguments to URI handlers that have
diff --git a/src/net/java/sip/communicator/impl/callhistory/CallHistoryServiceImpl.java b/src/net/java/sip/communicator/impl/callhistory/CallHistoryServiceImpl.java
index 03b7b13..087f27c 100644
--- a/src/net/java/sip/communicator/impl/callhistory/CallHistoryServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/callhistory/CallHistoryServiceImpl.java
@@ -9,8 +9,6 @@ package net.java.sip.communicator.impl.callhistory;
 import java.io.*;
 import java.util.*;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.callhistory.*;
 import net.java.sip.communicator.service.callhistory.event.*;
 import net.java.sip.communicator.service.contactlist.*;
@@ -22,6 +20,8 @@ import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * The Call History Service stores info about the calls made.
  * Logs calls info for all protocol providers that support basic telephony
diff --git a/src/net/java/sip/communicator/impl/certificate/CertificateVerificationActivator.java b/src/net/java/sip/communicator/impl/certificate/CertificateVerificationActivator.java
index e1a41bc..fbe5f6f 100644
--- a/src/net/java/sip/communicator/impl/certificate/CertificateVerificationActivator.java
+++ b/src/net/java/sip/communicator/impl/certificate/CertificateVerificationActivator.java
@@ -7,10 +7,10 @@
 package net.java.sip.communicator.impl.certificate;
 
 import net.java.sip.communicator.service.certificate.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.credentialsstorage.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/impl/configuration/ChangeEventDispatcher.java b/src/net/java/sip/communicator/impl/configuration/ChangeEventDispatcher.java
index 530f366..0fc7ac7 100644
--- a/src/net/java/sip/communicator/impl/configuration/ChangeEventDispatcher.java
+++ b/src/net/java/sip/communicator/impl/configuration/ChangeEventDispatcher.java
@@ -6,8 +6,8 @@
  */
 package net.java.sip.communicator.impl.configuration;
 
-import java.util.*;
 import java.beans.*;
+import java.util.*;
 
 import org.jitsi.service.configuration.*;
 
diff --git a/src/net/java/sip/communicator/impl/configuration/ConfigurationActivator.java b/src/net/java/sip/communicator/impl/configuration/ConfigurationActivator.java
index 86a28d7..c6a9e5c 100644
--- a/src/net/java/sip/communicator/impl/configuration/ConfigurationActivator.java
+++ b/src/net/java/sip/communicator/impl/configuration/ConfigurationActivator.java
@@ -6,10 +6,10 @@
  */
 package net.java.sip.communicator.impl.configuration;
 
-import org.osgi.framework.*;
+import net.java.sip.communicator.util.*;
 
 import org.jitsi.service.configuration.*;
-import net.java.sip.communicator.util.*;
+import org.osgi.framework.*;
 
 /**
  * @author Emil Ivov
diff --git a/src/net/java/sip/communicator/impl/configuration/xml/XMLConfUtils.java b/src/net/java/sip/communicator/impl/configuration/xml/XMLConfUtils.java
index 656a6a1..13a760d 100644
--- a/src/net/java/sip/communicator/impl/configuration/xml/XMLConfUtils.java
+++ b/src/net/java/sip/communicator/impl/configuration/xml/XMLConfUtils.java
@@ -6,10 +6,10 @@
  */
 package net.java.sip.communicator.impl.configuration.xml;
 
-import org.w3c.dom.*;
-
 import net.java.sip.communicator.util.xml.*;
 
+import org.w3c.dom.*;
+
 /**
  * Common XML Tasks.
  *
diff --git a/src/net/java/sip/communicator/impl/configuration/xml/XMLConfigurationStore.java b/src/net/java/sip/communicator/impl/configuration/xml/XMLConfigurationStore.java
index bc47ac3..9466354 100644
--- a/src/net/java/sip/communicator/impl/configuration/xml/XMLConfigurationStore.java
+++ b/src/net/java/sip/communicator/impl/configuration/xml/XMLConfigurationStore.java
@@ -11,12 +11,13 @@ import java.util.*;
 

 import javax.xml.parsers.*;

 

-import org.w3c.dom.*;

-import org.xml.sax.*;

-

 import net.java.sip.communicator.impl.configuration.*;

 import net.java.sip.communicator.util.*;

 import net.java.sip.communicator.util.xml.*;

+import net.java.sip.communicator.util.xml.XMLUtils;

+

+import org.w3c.dom.*;

+import org.xml.sax.*;

 

 /**

  * Implements a <code>ConfigurationStore</code> which serializes property

diff --git a/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java b/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java
index 45053e4..261b13e 100644
--- a/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java
@@ -8,8 +8,6 @@ package net.java.sip.communicator.impl.contactlist;
 
 import java.util.*;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.contactlist.event.*;
 import net.java.sip.communicator.service.protocol.*;
@@ -17,6 +15,8 @@ import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.xml.*;
 
+import org.osgi.framework.*;
+
 /**
  * An implementation of the MetaContactListService that would connect to
  * protocol service providers and build it  s contact list accordingly
diff --git a/src/net/java/sip/communicator/impl/credentialsstorage/CredentialsStorageServiceImpl.java b/src/net/java/sip/communicator/impl/credentialsstorage/CredentialsStorageServiceImpl.java
index 6329e97..93fa9ed 100644
--- a/src/net/java/sip/communicator/impl/credentialsstorage/CredentialsStorageServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/credentialsstorage/CredentialsStorageServiceImpl.java
@@ -8,11 +8,11 @@ package net.java.sip.communicator.impl.credentialsstorage;
 
 import java.util.*;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.credentialsstorage.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.configuration.*;
 import org.osgi.framework.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/filehistory/FileHistoryActivator.java b/src/net/java/sip/communicator/impl/filehistory/FileHistoryActivator.java
index c7225af..adcdf0f 100644
--- a/src/net/java/sip/communicator/impl/filehistory/FileHistoryActivator.java
+++ b/src/net/java/sip/communicator/impl/filehistory/FileHistoryActivator.java
@@ -6,11 +6,12 @@
  */
 package net.java.sip.communicator.impl.filehistory;
 
-import org.osgi.framework.*;
-import net.java.sip.communicator.service.history.*;
 import net.java.sip.communicator.service.filehistory.*;
+import net.java.sip.communicator.service.history.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  *
  * @author Damian Minkov
diff --git a/src/net/java/sip/communicator/impl/filehistory/FileHistoryServiceImpl.java b/src/net/java/sip/communicator/impl/filehistory/FileHistoryServiceImpl.java
index daf6464..a0b9e4a 100644
--- a/src/net/java/sip/communicator/impl/filehistory/FileHistoryServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/filehistory/FileHistoryServiceImpl.java
@@ -8,7 +8,7 @@ package net.java.sip.communicator.impl.filehistory;
 
 import java.io.*;
 import java.util.*;
-import org.osgi.framework.*;
+
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.filehistory.*;
 import net.java.sip.communicator.service.history.*;
@@ -17,6 +17,8 @@ import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * File History Service stores info for file transfers from various protocols.
  * Uses History Service.
diff --git a/src/net/java/sip/communicator/impl/globalshortcut/CallShortcut.java b/src/net/java/sip/communicator/impl/globalshortcut/CallShortcut.java
index fe3ceb0..01d2210 100644
--- a/src/net/java/sip/communicator/impl/globalshortcut/CallShortcut.java
+++ b/src/net/java/sip/communicator/impl/globalshortcut/CallShortcut.java
@@ -8,7 +8,7 @@ package net.java.sip.communicator.impl.globalshortcut;
 
 import java.awt.*;
 import java.util.*;
-import java.util.List; // disambiguation
+import java.util.List;
 
 import net.java.sip.communicator.service.globalshortcut.*;
 import net.java.sip.communicator.service.keybindings.*;
@@ -16,6 +16,7 @@ import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.service.protocol.media.*;
 import net.java.sip.communicator.util.*;
+// disambiguation
 
 /**
  * Shortcut for call (take the call, hang up, ...).
@@ -81,7 +82,6 @@ public class CallShortcut
     {
         AWTKeyStroke keystroke = evt.getKeyStroke();
         GlobalKeybindingSet set = keybindingsService.getGlobalBindings();
-        Call choosenCall = null;
 
         for(Map.Entry<String, List<AWTKeyStroke>> entry :
             set.getBindings().entrySet())
diff --git a/src/net/java/sip/communicator/impl/globalshortcut/UIShortcut.java b/src/net/java/sip/communicator/impl/globalshortcut/UIShortcut.java
index 02250fd..d0fa9f8 100644
--- a/src/net/java/sip/communicator/impl/globalshortcut/UIShortcut.java
+++ b/src/net/java/sip/communicator/impl/globalshortcut/UIShortcut.java
@@ -8,12 +8,13 @@ package net.java.sip.communicator.impl.globalshortcut;
 
 import java.awt.*;
 import java.util.*;
-import java.util.List; // disambiguation
+import java.util.List;
 
 import net.java.sip.communicator.service.globalshortcut.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.keybindings.*;
 import net.java.sip.communicator.util.*;
+// disambiguation
 
 /**
  * UI shortcut.
diff --git a/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsActivator.java b/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsActivator.java
index 0ee5675..45afa50 100644
--- a/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsActivator.java
+++ b/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsActivator.java
@@ -8,7 +8,6 @@ package net.java.sip.communicator.impl.googlecontacts;
 
 import java.util.*;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.contactsource.*;
 import net.java.sip.communicator.service.credentialsstorage.*;
 import net.java.sip.communicator.service.googlecontacts.*;
@@ -16,6 +15,7 @@ import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsConnectionImpl.java b/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsConnectionImpl.java
index 6f67ac1..2722a86 100644
--- a/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsConnectionImpl.java
+++ b/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsConnectionImpl.java
@@ -6,13 +6,13 @@
  */
 package net.java.sip.communicator.impl.googlecontacts;
 
+import net.java.sip.communicator.service.googlecontacts.*;
+import net.java.sip.communicator.util.*;
+
 import com.google.gdata.client.*;
 import com.google.gdata.client.contacts.*;
 import com.google.gdata.util.*;
 
-import net.java.sip.communicator.service.googlecontacts.*;
-import net.java.sip.communicator.util.*;
-
 /**
  * Google Contacts credentials to connect to the service.
  *
diff --git a/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsEntryImpl.java b/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsEntryImpl.java
index bc53cb2..8384c19 100644
--- a/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsEntryImpl.java
+++ b/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsEntryImpl.java
@@ -11,8 +11,9 @@ import java.util.*;
 import net.java.sip.communicator.service.googlecontacts.*;
 
 import com.google.gdata.data.*;
+import com.google.gdata.data.contacts.ContactEntry;
 import com.google.gdata.data.extensions.*;
-import com.google.gdata.data.contacts.ContactEntry; //disambiguation
+//disambiguation
 
 /**
  * Google Contacts entry implementation.
diff --git a/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsServiceImpl.java b/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsServiceImpl.java
index 509ecd9..14f910f 100644
--- a/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsServiceImpl.java
@@ -11,17 +11,18 @@ import java.net.*;
 import java.util.*;
 import java.util.regex.*;
 
-import org.jitsi.service.configuration.*;
+import net.java.sip.communicator.impl.googlecontacts.configform.*;
 import net.java.sip.communicator.service.credentialsstorage.*;
 import net.java.sip.communicator.service.googlecontacts.*;
-import net.java.sip.communicator.impl.googlecontacts.configform.*;
 import net.java.sip.communicator.util.*;
 
-import com.google.gdata.client.Service.*;
+import org.jitsi.service.configuration.*;
+
+import com.google.gdata.client.Service.GDataRequest;
 import com.google.gdata.client.contacts.*;
 import com.google.gdata.data.*;
-import com.google.gdata.data.contacts.ContactFeed;
 import com.google.gdata.data.contacts.ContactEntry;
+import com.google.gdata.data.contacts.ContactFeed;
 import com.google.gdata.data.extensions.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/googlecontacts/configform/AccountSettingsForm.java b/src/net/java/sip/communicator/impl/googlecontacts/configform/AccountSettingsForm.java
index 66b6195..77e99c8 100644
--- a/src/net/java/sip/communicator/impl/googlecontacts/configform/AccountSettingsForm.java
+++ b/src/net/java/sip/communicator/impl/googlecontacts/configform/AccountSettingsForm.java
@@ -8,11 +8,12 @@ package net.java.sip.communicator.impl.googlecontacts.configform;
 
 import java.awt.*;
 import java.awt.event.*;
+
 import javax.swing.*;
 
-import net.java.sip.communicator.util.swing.*;
 import net.java.sip.communicator.impl.googlecontacts.*;
 import net.java.sip.communicator.service.googlecontacts.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The page with hostname/port/encryption fields
diff --git a/src/net/java/sip/communicator/impl/googlecontacts/configform/GoogleContactsConfigForm.java b/src/net/java/sip/communicator/impl/googlecontacts/configform/GoogleContactsConfigForm.java
index d170faf..5a5e4d1 100644
--- a/src/net/java/sip/communicator/impl/googlecontacts/configform/GoogleContactsConfigForm.java
+++ b/src/net/java/sip/communicator/impl/googlecontacts/configform/GoogleContactsConfigForm.java
@@ -12,11 +12,11 @@ import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
 
-import net.java.sip.communicator.util.*;
-import net.java.sip.communicator.util.swing.*;
 import net.java.sip.communicator.impl.googlecontacts.*;
-import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.googlecontacts.*;
+import net.java.sip.communicator.service.gui.*;
+import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * This ConfigurationForm shows the list of Google Contacts account and allow
diff --git a/src/net/java/sip/communicator/impl/googlecontacts/configform/GoogleContactsTableModel.java b/src/net/java/sip/communicator/impl/googlecontacts/configform/GoogleContactsTableModel.java
index 5f1bdb1..b91c66a 100644
--- a/src/net/java/sip/communicator/impl/googlecontacts/configform/GoogleContactsTableModel.java
+++ b/src/net/java/sip/communicator/impl/googlecontacts/configform/GoogleContactsTableModel.java
@@ -10,8 +10,8 @@ import java.util.*;
 
 import javax.swing.table.*;
 
-import net.java.sip.communicator.service.googlecontacts.*;
 import net.java.sip.communicator.impl.googlecontacts.*;
+import net.java.sip.communicator.service.googlecontacts.*;
 
 
 /**
diff --git a/src/net/java/sip/communicator/impl/growlnotification/GrowlNotificationActivator.java b/src/net/java/sip/communicator/impl/growlnotification/GrowlNotificationActivator.java
index ac32c63..4dff18b 100644
--- a/src/net/java/sip/communicator/impl/growlnotification/GrowlNotificationActivator.java
+++ b/src/net/java/sip/communicator/impl/growlnotification/GrowlNotificationActivator.java
@@ -6,11 +6,11 @@
  */
 package net.java.sip.communicator.impl.growlnotification;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.service.systray.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/ChatToolbarButton.java b/src/net/java/sip/communicator/impl/gui/customcontrols/ChatToolbarButton.java
index 9be5b09..dab2241 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/ChatToolbarButton.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/ChatToolbarButton.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.impl.gui.customcontrols;
 
 import java.awt.*;
+
 import net.java.sip.communicator.util.swing.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/LabelTableCellRenderer.java b/src/net/java/sip/communicator/impl/gui/customcontrols/LabelTableCellRenderer.java
index c555ea5..fc0b0ae 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/LabelTableCellRenderer.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/LabelTableCellRenderer.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.impl.gui.customcontrols;
 
 import java.awt.*;
+
 import javax.swing.*;
 import javax.swing.table.*;
 
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/WizardController.java b/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/WizardController.java
index 255154c..094530d 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/WizardController.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/WizardController.java
@@ -9,12 +9,12 @@ package net.java.sip.communicator.impl.gui.customcontrols.wizard;
 
 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.service.gui.*;
 
-import javax.swing.*;
-
 /**
  * This class is responsible for reacting to events generated by pushing any
  * of the three buttons, 'Next', 'Previous', and 'Cancel.' Based on what
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommBorders.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommBorders.java
index 919cc90..81bd934 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommBorders.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommBorders.java
@@ -6,9 +6,9 @@
 package net.java.sip.communicator.impl.gui.lookandfeel;
 
 import java.awt.*;
+
 import javax.swing.border.*;
 import javax.swing.plaf.*;
-import javax.swing.plaf.UIResource;
 import javax.swing.plaf.basic.*;
 import javax.swing.text.*;
 
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommScrollBarUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommScrollBarUI.java
index 6451fc5..4e7333c 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommScrollBarUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommScrollBarUI.java
@@ -8,6 +8,7 @@ package net.java.sip.communicator.impl.gui.lookandfeel;
 
 import java.awt.*;
 import java.awt.image.*;
+
 import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.metal.*;
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextAreaUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextAreaUI.java
index 2a488df..27cf038 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextAreaUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextAreaUI.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.impl.gui.lookandfeel;
 
 import java.awt.*;
+
 import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToolBarSeparatorUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToolBarSeparatorUI.java
index cdada27..a0c9533 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToolBarSeparatorUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToolBarSeparatorUI.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.impl.gui.lookandfeel;
 
 import java.awt.*;
+
 import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/DialPadButton.java b/src/net/java/sip/communicator/impl/gui/main/DialPadButton.java
index a6e9738..797802a 100644
--- a/src/net/java/sip/communicator/impl/gui/main/DialPadButton.java
+++ b/src/net/java/sip/communicator/impl/gui/main/DialPadButton.java
@@ -9,7 +9,7 @@ package net.java.sip.communicator.impl.gui.main;
 import java.awt.*;
 import java.awt.event.*;
 
-import javax.swing.BorderFactory;
+import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.util.swing.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/DialPadFieldUI.java b/src/net/java/sip/communicator/impl/gui/main/DialPadFieldUI.java
index c4cf252..930a5e9 100644
--- a/src/net/java/sip/communicator/impl/gui/main/DialPadFieldUI.java
+++ b/src/net/java/sip/communicator/impl/gui/main/DialPadFieldUI.java
@@ -8,13 +8,13 @@ package net.java.sip.communicator.impl.gui.main;
 
 import java.awt.*;
 
+import javax.swing.*;
+import javax.swing.plaf.*;
+
 import net.java.sip.communicator.util.skin.*;
 import net.java.sip.communicator.util.swing.*;
 import net.java.sip.communicator.util.swing.plaf.*;
 
-import javax.swing.*;
-import javax.swing.plaf.*;
-
 /**
  * The <tt>SearchTextFieldUI</tt> is the one responsible for the search field
  * look & feel. It draws a search icon inside the field and adjusts the bounds
diff --git a/src/net/java/sip/communicator/impl/gui/main/account/AccountRegSummaryPage.java b/src/net/java/sip/communicator/impl/gui/main/account/AccountRegSummaryPage.java
index da348d3..0d107e7 100644
--- a/src/net/java/sip/communicator/impl/gui/main/account/AccountRegSummaryPage.java
+++ b/src/net/java/sip/communicator/impl/gui/main/account/AccountRegSummaryPage.java
@@ -12,7 +12,6 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-
 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/gui/main/account/EmptyAccountRegistrationForm.java b/src/net/java/sip/communicator/impl/gui/main/account/EmptyAccountRegistrationForm.java
index 68aed86..2807bc9 100644
--- a/src/net/java/sip/communicator/impl/gui/main/account/EmptyAccountRegistrationForm.java
+++ b/src/net/java/sip/communicator/impl/gui/main/account/EmptyAccountRegistrationForm.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.impl.gui.main.account;
 
 import java.awt.*;
+
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/account/EmptyAccountRegistrationWizard.java b/src/net/java/sip/communicator/impl/gui/main/account/EmptyAccountRegistrationWizard.java
index b973407..b78d29a 100644
--- a/src/net/java/sip/communicator/impl/gui/main/account/EmptyAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/impl/gui/main/account/EmptyAccountRegistrationWizard.java
@@ -8,7 +8,7 @@ package net.java.sip.communicator.impl.gui.main.account;
 
 import java.awt.*;
 import java.util.*;
-import java.util.Map.*;
+import java.util.Map.Entry;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.service.gui.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java
index bfb9df9..491d785 100644
--- a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.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.main.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.*;
 import net.java.sip.communicator.impl.gui.utils.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java
index da1e142..5589fc6 100644
--- a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java
@@ -12,8 +12,6 @@ import java.awt.event.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
-
-import net.java.sip.communicator.impl.gui.lookandfeel.*;
 import net.java.sip.communicator.impl.gui.main.*;
 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/authorization/RequestAuthorizationDialog.java b/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java
index da562e4..79a3d80 100644
--- a/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.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.main.*;
 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/call/CallButton.java b/src/net/java/sip/communicator/impl/gui/main/call/CallButton.java
index 69c86d5..e5bedc5 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallButton.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/CallButton.java
@@ -15,7 +15,7 @@ import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.skin.*;
 import net.java.sip.communicator.util.swing.*;
-import net.java.sip.communicator.util.swing.event.TextFieldChangeListener;
+import net.java.sip.communicator.util.swing.event.*;
 
 /**
  * 
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferenceInviteDialog.java b/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferenceInviteDialog.java
index 0dc53c4..a4d9a1f 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferenceInviteDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferenceInviteDialog.java
@@ -9,7 +9,7 @@ package net.java.sip.communicator.impl.gui.main.call.conference;
 import java.awt.*;
 import java.awt.event.*;
 import java.util.*;
-import java.util.List; // disambiguation
+import java.util.List;
 
 import javax.swing.*;
 
@@ -19,6 +19,7 @@ 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.util.swing.*;
+// disambiguation
 
 /**
  * The invite dialog is the one shown when the user clicks on the conference
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
index bf138d1..678a71f 100755
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
@@ -12,7 +12,8 @@ import java.awt.event.*;
 import java.io.*;
 import java.net.*;
 import java.util.*;
-import java.util.Map.*;
+import java.util.Map.Entry;
+import java.util.Map;
 import java.util.regex.*;
 
 import javax.swing.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java
index 1c31499..a93cedb 100755
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java
@@ -19,15 +19,16 @@ import javax.swing.undo.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
+import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.main.chat.menus.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.gui.event.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.skin.*;
 import net.java.sip.communicator.util.swing.*;
-import net.java.sip.communicator.impl.gui.main.chat.conference.*;
+
+import org.jitsi.service.configuration.*;
 
 /**
  * The <tt>ChatWritePanel</tt> is the panel, where user writes her messages.
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/SendSmsDialog.java b/src/net/java/sip/communicator/impl/gui/main/chat/SendSmsDialog.java
index 8f28b24..f86b2fb 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/SendSmsDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/SendSmsDialog.java
@@ -12,7 +12,6 @@ import java.awt.event.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
-
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.swing.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatContactCellRenderer.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatContactCellRenderer.java
index 1bf08f7..ded8b1e 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatContactCellRenderer.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatContactCellRenderer.java
@@ -16,7 +16,8 @@ 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.protocol.*;
-import net.java.sip.communicator.service.protocol.ServerStoredDetails.*;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.BinaryDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.GenericDetail;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatContactRoleIcon.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatContactRoleIcon.java
index 80b3a8c..2541687 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatContactRoleIcon.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatContactRoleIcon.java
@@ -7,7 +7,8 @@
 package net.java.sip.communicator.impl.gui.main.chat.conference;
 
 import javax.swing.*;
-import net.java.sip.communicator.impl.gui.utils.ImageLoader;
+
+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/filetransfer/ReceiveFileConversationComponent.java b/src/net/java/sip/communicator/impl/gui/main/chat/filetransfer/ReceiveFileConversationComponent.java
index a95c60a..8a53fcb 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/filetransfer/ReceiveFileConversationComponent.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/filetransfer/ReceiveFileConversationComponent.java
@@ -17,8 +17,8 @@ import net.java.sip.communicator.impl.gui.main.chat.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
-// Disambiguates SwingWorker on Java 6 in the presence of javax.swing.*
 import net.java.sip.communicator.util.swing.SwingWorker;
+// Disambiguates SwingWorker on Java 6 in the presence of javax.swing.*
 
 /**
  * The <tt>ReceiveFileConversationComponent</tt> is the component shown in the
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 d61a466..8718564 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
@@ -20,9 +20,9 @@ import net.java.sip.communicator.impl.gui.*;
 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.filetransfer.*;
-import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.filehistory.*;
+import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.history.event.*;
 import net.java.sip.communicator.service.metahistory.*;
 import net.java.sip.communicator.service.msghistory.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/menus/MessageWindowMenuBar.java b/src/net/java/sip/communicator/impl/gui/main/chat/menus/MessageWindowMenuBar.java
index b8617bf..b3bd13b 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/menus/MessageWindowMenuBar.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/menus/MessageWindowMenuBar.java
@@ -15,8 +15,9 @@ import net.java.sip.communicator.impl.gui.main.menus.*;
 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; // disambiguation
+import net.java.sip.communicator.service.gui.Container;
 import net.java.sip.communicator.util.swing.*;
+// disambiguation
 
 /**
  * The <tt>MessageWindowMenuBar</tt> is the menu bar in the chat window where
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/menus/OptionsMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/menus/OptionsMenu.java
index c7240c4..a4132bf 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/menus/OptionsMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/menus/OptionsMenu.java
@@ -13,7 +13,7 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
-import net.java.sip.communicator.impl.gui.utils.ConfigurationManager;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.util.swing.*;
 /**
  * The <tt>OptionMenu</tt> is a menu in the chat window menu bar.
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 2394516..b8fea1c 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
@@ -27,7 +27,12 @@ import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.protocol.ServerStoredDetails.*;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.FaxDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.GenericDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.MobilePhoneDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.PagerDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.PhoneNumberDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.WorkPhoneDetail;
 import net.java.sip.communicator.util.skin.*;
 import net.java.sip.communicator.util.swing.*;
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomList.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomList.java
index 74c006f..4ef442d 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomList.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomList.java
@@ -11,10 +11,10 @@ import java.util.*;
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.osgi.framework.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomTableUI.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomTableUI.java
index 0c22a71..55f30df 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomTableUI.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomTableUI.java
@@ -14,13 +14,13 @@ import javax.swing.*;
 import javax.swing.event.*;
 import javax.swing.table.*;
 
-import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.util.swing.*;
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 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.utils.*;
+import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * The <tt>ChatRoomTableUI</tt> is the panel that contains the
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomDialog.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomDialog.java
index f1c0cc0..0dd779e 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomDialog.java
@@ -13,7 +13,6 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
-
 import net.java.sip.communicator.util.swing.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomAuthenticationWindow.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomAuthenticationWindow.java
index 9a0830c..dc735e3 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomAuthenticationWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomAuthenticationWindow.java
@@ -14,7 +14,6 @@ import javax.swing.*;
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-
 import net.java.sip.communicator.util.skin.*;
 import net.java.sip.communicator.util.swing.*;
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/AddContactDialog.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/AddContactDialog.java
index fece94f..e6ebc67 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/AddContactDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/AddContactDialog.java
@@ -15,7 +15,6 @@ import javax.swing.*;
 import javax.swing.event.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.addgroup.*;
 import net.java.sip.communicator.impl.gui.utils.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java
index f92eb91..f7cefeb 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java
@@ -7,13 +7,12 @@
 package net.java.sip.communicator.impl.gui.main.contactlist;
 
 import java.awt.*;
-
 import java.awt.event.*;
 import java.util.*;
 import java.util.List;
 
 import javax.swing.*;
-import javax.swing.JPopupMenu.*;
+import javax.swing.JPopupMenu.Separator;
 import javax.swing.tree.*;
 
 import net.java.sip.communicator.impl.gui.*;
@@ -21,10 +20,15 @@ import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.main.call.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.contactsource.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.service.contactsource.*;
 import net.java.sip.communicator.service.contactlist.*;
+import net.java.sip.communicator.service.contactsource.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.protocol.ServerStoredDetails.*;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.FaxDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.GenericDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.MobilePhoneDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.PagerDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.PhoneNumberDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.WorkPhoneDetail;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.skin.*;
 import net.java.sip.communicator.util.swing.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactRightButtonMenu.java
index 0b87d58..c07af37 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactRightButtonMenu.java
@@ -10,7 +10,7 @@ import java.awt.*;
 import java.awt.event.*;
 import java.io.*;
 import java.util.*;
-import java.util.List; // disambiguation
+import java.util.List;
 
 import javax.swing.*;
 
@@ -29,12 +29,18 @@ import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.OperationSetExtendedAuthorizations.SubscriptionStatus;
-import net.java.sip.communicator.service.protocol.ServerStoredDetails.*;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.FaxDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.GenericDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.MobilePhoneDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.PagerDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.PhoneNumberDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.WorkPhoneDetail;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.skin.*;
 import net.java.sip.communicator.util.swing.*;
 
 import org.osgi.framework.*;
+// disambiguation
 
 /**
  * The ContactRightButtonMenu is the menu, opened when user clicks with the
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 b711498..f1107da 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
@@ -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.main.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.util.swing.*;
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 4d44fdc..6d00740 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
@@ -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.main.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.util.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 f91b5ec..6fb9fa1 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
@@ -12,7 +12,6 @@ import java.awt.event.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
-
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.swing.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/contactsource/MetaContactListSource.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/contactsource/MetaContactListSource.java
index 915632d..2b896ff 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/contactsource/MetaContactListSource.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/contactsource/MetaContactListSource.java
@@ -9,6 +9,8 @@ package net.java.sip.communicator.impl.gui.main.contactlist.contactsource;
 import java.util.*;
 import java.util.regex.*;
 
+import javax.swing.*;
+
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.*;
 import net.java.sip.communicator.service.contactlist.*;
@@ -17,8 +19,6 @@ import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 
-import javax.swing.*;
-
 /**
  * The <tt>MetaContactListSource</tt> is an abstraction of the
  * <tt>MetaContactListService</tt>, which makes the correspondence between a
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/contactsource/MetaUIContact.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/contactsource/MetaUIContact.java
index e6735cb..7c3020d 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/contactsource/MetaUIContact.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/contactsource/MetaUIContact.java
@@ -16,7 +16,12 @@ 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.OperationSetExtendedAuthorizations.SubscriptionStatus;
-import net.java.sip.communicator.service.protocol.ServerStoredDetails.*;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.FaxDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.GenericDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.MobilePhoneDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.PagerDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.PhoneNumberDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.WorkPhoneDetail;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/login/DefaultSecurityAuthority.java b/src/net/java/sip/communicator/impl/gui/main/login/DefaultSecurityAuthority.java
index e2c9753..cd30e9b 100644
--- a/src/net/java/sip/communicator/impl/gui/main/login/DefaultSecurityAuthority.java
+++ b/src/net/java/sip/communicator/impl/gui/main/login/DefaultSecurityAuthority.java
@@ -8,10 +8,10 @@ package net.java.sip.communicator.impl.gui.main.login;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.GuiActivator;
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.util.swing.AuthenticationWindow;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * Utility class that can be used in cases where components other than the main
diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java
index 5bfde24..03b4c5b 100644
--- a/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java
@@ -18,13 +18,14 @@ import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.lookandfeel.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.service.systray.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.configuration.*;
+
 /**
  * The <tt>GlobalStatusSelectorBox</tt> is a global status selector box, which
  * appears in the status panel, when the user has more than one account. It
diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/StatusSelectorMenu.java b/src/net/java/sip/communicator/impl/gui/main/presence/StatusSelectorMenu.java
index 4cc7968..e7b4915 100644
--- a/src/net/java/sip/communicator/impl/gui/main/presence/StatusSelectorMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/StatusSelectorMenu.java
@@ -13,11 +13,12 @@ import java.util.List;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.skin.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.configuration.*;
+
 /**
  * A parent class for all status selector boxes.
  * 
diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/avatar/AvatarStackManager.java b/src/net/java/sip/communicator/impl/gui/main/presence/avatar/AvatarStackManager.java
index 7bf2844..7370d5f 100644
--- a/src/net/java/sip/communicator/impl/gui/main/presence/avatar/AvatarStackManager.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/avatar/AvatarStackManager.java
@@ -12,7 +12,6 @@ import java.io.*;
 import javax.imageio.*;
 
 import net.java.sip.communicator.impl.gui.*;
-
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/avatar/SelectAvatarMenu.java b/src/net/java/sip/communicator/impl/gui/main/presence/avatar/SelectAvatarMenu.java
index 665664f..d9cd061 100644
--- a/src/net/java/sip/communicator/impl/gui/main/presence/avatar/SelectAvatarMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/avatar/SelectAvatarMenu.java
@@ -6,19 +6,18 @@
  */
 package net.java.sip.communicator.impl.gui.main.presence.avatar;
 
-import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.main.presence.avatar.imagepicker.*;
-import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.util.*;
-import net.java.sip.communicator.util.swing.*;
-
 import java.awt.*;
 import java.awt.event.*;
 import java.awt.image.*;
 
 import javax.swing.*;
 
+import net.java.sip.communicator.impl.gui.*;
+import net.java.sip.communicator.impl.gui.main.presence.avatar.imagepicker.*;
+import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
+
 /**
  * The dialog used as menu.
  *
diff --git a/src/net/java/sip/communicator/impl/gui/utils/ConfigurationManager.java b/src/net/java/sip/communicator/impl/gui/utils/ConfigurationManager.java
index 73c078b..7dd46c2 100644
--- a/src/net/java/sip/communicator/impl/gui/utils/ConfigurationManager.java
+++ b/src/net/java/sip/communicator/impl/gui/utils/ConfigurationManager.java
@@ -11,9 +11,9 @@ import java.beans.*;
 import java.util.List;
 
 import net.java.sip.communicator.impl.gui.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.protocol.*;
 
+import org.jitsi.service.configuration.*;
 import org.osgi.framework.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/utils/PluginContainer.java b/src/net/java/sip/communicator/impl/gui/utils/PluginContainer.java
index 67cfcae..0f74af2 100644
--- a/src/net/java/sip/communicator/impl/gui/utils/PluginContainer.java
+++ b/src/net/java/sip/communicator/impl/gui/utils/PluginContainer.java
@@ -11,14 +11,14 @@ import java.util.*;
 

 import javax.swing.*;

 

-import org.osgi.framework.*;

-

 import net.java.sip.communicator.impl.gui.*;

 import net.java.sip.communicator.impl.gui.event.*;

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

 import net.java.sip.communicator.service.gui.Container;

 import net.java.sip.communicator.util.*;

 

+import org.osgi.framework.*;

+

 /**

  * Provides capabilities to a specific <code>JComponent</code> to contain

  * <code>PluginComponent</code>s, track when they are added and removed.

diff --git a/src/net/java/sip/communicator/impl/hid/HIDActivator.java b/src/net/java/sip/communicator/impl/hid/HIDActivator.java
index 0480c84..bcbc5c3 100644
--- a/src/net/java/sip/communicator/impl/hid/HIDActivator.java
+++ b/src/net/java/sip/communicator/impl/hid/HIDActivator.java
@@ -6,11 +6,11 @@
  */
 package net.java.sip.communicator.impl.hid;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.hid.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * OSGi activator for the HID service.
  *
diff --git a/src/net/java/sip/communicator/impl/history/DBStructSerializer.java b/src/net/java/sip/communicator/impl/history/DBStructSerializer.java
index 5bc581b..d9e30b1 100644
--- a/src/net/java/sip/communicator/impl/history/DBStructSerializer.java
+++ b/src/net/java/sip/communicator/impl/history/DBStructSerializer.java
@@ -9,14 +9,16 @@ package net.java.sip.communicator.impl.history;
 import java.io.*;
 import java.text.*;
 import java.util.*;
+
 import javax.xml.parsers.*;
 
-import org.w3c.dom.*;
-import org.xml.sax.*;
 import net.java.sip.communicator.service.history.*;
 import net.java.sip.communicator.service.history.records.*;
 import net.java.sip.communicator.util.xml.XMLUtils;
 
+import org.w3c.dom.*;
+import org.xml.sax.*;
+
 /**
  *
  * @author Alexander Pelov
diff --git a/src/net/java/sip/communicator/impl/history/HistoryActivator.java b/src/net/java/sip/communicator/impl/history/HistoryActivator.java
index 438db08..f23f9fe 100644
--- a/src/net/java/sip/communicator/impl/history/HistoryActivator.java
+++ b/src/net/java/sip/communicator/impl/history/HistoryActivator.java
@@ -6,10 +6,10 @@
  */
 package net.java.sip.communicator.impl.history;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.history.*;
 
+import org.osgi.framework.*;
+
 /**
  * Invoke "Service Binder" to parse the service XML and register all services.
  *
diff --git a/src/net/java/sip/communicator/impl/history/HistoryImpl.java b/src/net/java/sip/communicator/impl/history/HistoryImpl.java
index 21f6408..b8641ee 100644
--- a/src/net/java/sip/communicator/impl/history/HistoryImpl.java
+++ b/src/net/java/sip/communicator/impl/history/HistoryImpl.java
@@ -13,7 +13,7 @@ import java.util.*;
 import net.java.sip.communicator.service.history.*;
 import net.java.sip.communicator.service.history.records.*;
 import net.java.sip.communicator.util.*;
-import net.java.sip.communicator.util.xml.*;
+import net.java.sip.communicator.util.xml.XMLUtils;
 
 import org.w3c.dom.*;
 
diff --git a/src/net/java/sip/communicator/impl/history/HistoryReaderImpl.java b/src/net/java/sip/communicator/impl/history/HistoryReaderImpl.java
index 79fe5cd..b2be60e 100644
--- a/src/net/java/sip/communicator/impl/history/HistoryReaderImpl.java
+++ b/src/net/java/sip/communicator/impl/history/HistoryReaderImpl.java
@@ -9,12 +9,12 @@ package net.java.sip.communicator.impl.history;
 import java.util.*;
 import java.util.regex.*;
 
-import org.w3c.dom.*;
-
 import net.java.sip.communicator.service.history.*;
 import net.java.sip.communicator.service.history.event.*;
 import net.java.sip.communicator.service.history.records.*;
 
+import org.w3c.dom.*;
+
 /**
  * @author Alexander Pelov
  * @author Damian Minkov
diff --git a/src/net/java/sip/communicator/impl/history/HistoryWriterImpl.java b/src/net/java/sip/communicator/impl/history/HistoryWriterImpl.java
index 144e342..1dec7d3 100644
--- a/src/net/java/sip/communicator/impl/history/HistoryWriterImpl.java
+++ b/src/net/java/sip/communicator/impl/history/HistoryWriterImpl.java
@@ -10,11 +10,11 @@ import java.io.*;
 import java.security.*;
 import java.util.*;
 
-import org.w3c.dom.*;
-
 import net.java.sip.communicator.service.history.*;
 import net.java.sip.communicator.service.history.records.*;
-import net.java.sip.communicator.util.xml.*;
+import net.java.sip.communicator.util.xml.XMLUtils;
+
+import org.w3c.dom.*;
 
 /**
  * @author Alexander Pelov
diff --git a/src/net/java/sip/communicator/impl/keybindings/KeybindingSetImpl.java b/src/net/java/sip/communicator/impl/keybindings/KeybindingSetImpl.java
index 26780aa..576bcf9 100644
--- a/src/net/java/sip/communicator/impl/keybindings/KeybindingSetImpl.java
+++ b/src/net/java/sip/communicator/impl/keybindings/KeybindingSetImpl.java
@@ -5,12 +5,12 @@
  */
 package net.java.sip.communicator.impl.keybindings;
 
-import java.io.File;
+import java.io.*;
 import java.util.*;
 
-import javax.swing.KeyStroke;
+import javax.swing.*;
 
-import net.java.sip.communicator.service.keybindings.KeybindingSet;
+import net.java.sip.communicator.service.keybindings.*;
 
 /**
  * Default implementation for the wrapper of keybinding sets.
diff --git a/src/net/java/sip/communicator/impl/keybindings/KeybindingsActivator.java b/src/net/java/sip/communicator/impl/keybindings/KeybindingsActivator.java
index f8ca357..7d8c0c3 100644
--- a/src/net/java/sip/communicator/impl/keybindings/KeybindingsActivator.java
+++ b/src/net/java/sip/communicator/impl/keybindings/KeybindingsActivator.java
@@ -6,10 +6,10 @@
  */
 package net.java.sip.communicator.impl.keybindings;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.keybindings.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/impl/ldap/LdapContactQuery.java b/src/net/java/sip/communicator/impl/ldap/LdapContactQuery.java
index 52c9dbe..5fcc86b 100644
--- a/src/net/java/sip/communicator/impl/ldap/LdapContactQuery.java
+++ b/src/net/java/sip/communicator/impl/ldap/LdapContactQuery.java
@@ -9,10 +9,10 @@ package net.java.sip.communicator.impl.ldap;
 import java.util.*;
 import java.util.regex.*;
 
+import net.java.sip.communicator.service.contactsource.*;
 import net.java.sip.communicator.service.ldap.*;
 import net.java.sip.communicator.service.ldap.event.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.contactsource.*;
 import net.java.sip.communicator.util.swing.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/ldap/LdapDirectoryImpl.java b/src/net/java/sip/communicator/impl/ldap/LdapDirectoryImpl.java
index 0f4f7fe..b99b29a 100644
--- a/src/net/java/sip/communicator/impl/ldap/LdapDirectoryImpl.java
+++ b/src/net/java/sip/communicator/impl/ldap/LdapDirectoryImpl.java
@@ -11,10 +11,9 @@ import java.util.*;
 import javax.naming.*;
 import javax.naming.directory.*;
 
-import net.java.sip.communicator.util.*;
-
 import net.java.sip.communicator.service.ldap.*;
 import net.java.sip.communicator.service.ldap.event.*;
+import net.java.sip.communicator.util.*;
 
 /**
  * An LdapDirectory stores settings for one directory server
diff --git a/src/net/java/sip/communicator/impl/ldap/LdapDirectorySetImpl.java b/src/net/java/sip/communicator/impl/ldap/LdapDirectorySetImpl.java
index 7349219..1438080 100644
--- a/src/net/java/sip/communicator/impl/ldap/LdapDirectorySetImpl.java
+++ b/src/net/java/sip/communicator/impl/ldap/LdapDirectorySetImpl.java
@@ -8,10 +8,11 @@ package net.java.sip.communicator.impl.ldap;
 
 import java.util.*;
 
-import net.java.sip.communicator.util.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.ldap.*;
 import net.java.sip.communicator.service.ldap.event.*;
+import net.java.sip.communicator.util.*;
+
+import org.jitsi.service.configuration.*;
 
 /**
  * A thread-safe implementation of LdapDirectorySet, backed by a TreeMap
diff --git a/src/net/java/sip/communicator/impl/ldap/LdapDirectorySettingsImpl.java b/src/net/java/sip/communicator/impl/ldap/LdapDirectorySettingsImpl.java
index 940772a..1ae6b51 100644
--- a/src/net/java/sip/communicator/impl/ldap/LdapDirectorySettingsImpl.java
+++ b/src/net/java/sip/communicator/impl/ldap/LdapDirectorySettingsImpl.java
@@ -8,10 +8,11 @@ package net.java.sip.communicator.impl.ldap;
 
 import java.util.*;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.credentialsstorage.*;
 import net.java.sip.communicator.service.ldap.*;
 
+import org.jitsi.service.configuration.*;
+
 /**
  * @author Sebastien Mazy
  *
diff --git a/src/net/java/sip/communicator/impl/ldap/LdapServiceImpl.java b/src/net/java/sip/communicator/impl/ldap/LdapServiceImpl.java
index da18a07..9098a70 100644
--- a/src/net/java/sip/communicator/impl/ldap/LdapServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/ldap/LdapServiceImpl.java
@@ -8,15 +8,15 @@ package net.java.sip.communicator.impl.ldap;
 
 import java.util.*;
 
-import org.osgi.framework.*;
-
-import net.java.sip.communicator.service.certificate.CertificateService;
-import org.jitsi.service.configuration.*;
-import net.java.sip.communicator.service.contactsource.ContactSourceService;
+import net.java.sip.communicator.service.certificate.*;
+import net.java.sip.communicator.service.contactsource.*;
 import net.java.sip.communicator.service.credentialsstorage.*;
 import net.java.sip.communicator.service.ldap.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
+import org.osgi.framework.*;
+
 /**
  * The LDAP service allows other modules to query an LDAP server.
  *
diff --git a/src/net/java/sip/communicator/impl/metahistory/MetaHistoryActivator.java b/src/net/java/sip/communicator/impl/metahistory/MetaHistoryActivator.java
index 7538dc0..625c04a 100644
--- a/src/net/java/sip/communicator/impl/metahistory/MetaHistoryActivator.java
+++ b/src/net/java/sip/communicator/impl/metahistory/MetaHistoryActivator.java
@@ -6,9 +6,10 @@
  */
 package net.java.sip.communicator.impl.metahistory;
 
-import org.osgi.framework.*;
-import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.service.metahistory.*;
+import net.java.sip.communicator.util.*;
+
+import org.osgi.framework.*;
 
 /**
  * Activates the MetaHistoryService
diff --git a/src/net/java/sip/communicator/impl/metahistory/MetaHistoryServiceImpl.java b/src/net/java/sip/communicator/impl/metahistory/MetaHistoryServiceImpl.java
index 4f47806..3c7fc01 100644
--- a/src/net/java/sip/communicator/impl/metahistory/MetaHistoryServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/metahistory/MetaHistoryServiceImpl.java
@@ -8,19 +8,20 @@ package net.java.sip.communicator.impl.metahistory;
 
 import java.util.*;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.callhistory.*;
+import net.java.sip.communicator.service.callhistory.event.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.filehistory.*;
+import net.java.sip.communicator.service.history.event.*;
+import net.java.sip.communicator.service.history.event.ProgressEvent;
 import net.java.sip.communicator.service.metahistory.*;
 import net.java.sip.communicator.service.msghistory.*;
-import net.java.sip.communicator.service.history.event.*;
+import net.java.sip.communicator.service.msghistory.event.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
-import net.java.sip.communicator.service.msghistory.event.MessageHistorySearchProgressListener;
-import net.java.sip.communicator.service.callhistory.event.CallHistorySearchProgressListener;
+
+import org.osgi.framework.*;
 
 /**
  * The Meta History Service is wrapper around the other known
diff --git a/src/net/java/sip/communicator/impl/msghistory/MessageHistoryServiceImpl.java b/src/net/java/sip/communicator/impl/msghistory/MessageHistoryServiceImpl.java
index 3eb3c5b..987fe9a 100644
--- a/src/net/java/sip/communicator/impl/msghistory/MessageHistoryServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/msghistory/MessageHistoryServiceImpl.java
@@ -10,7 +10,6 @@ import java.beans.*;
 import java.io.*;
 import java.util.*;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.history.*;
 import net.java.sip.communicator.service.history.event.*;
@@ -22,6 +21,7 @@ import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/impl/neomedia/ZrtpConfigurePanel.java b/src/net/java/sip/communicator/impl/neomedia/ZrtpConfigurePanel.java
index eef4d7a..0262a73 100644
--- a/src/net/java/sip/communicator/impl/neomedia/ZrtpConfigurePanel.java
+++ b/src/net/java/sip/communicator/impl/neomedia/ZrtpConfigurePanel.java
@@ -14,9 +14,9 @@ import javax.swing.*;
 import javax.swing.event.*;
 import javax.swing.table.*;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/neomedia/ZrtpConfigureTableModel.java b/src/net/java/sip/communicator/impl/neomedia/ZrtpConfigureTableModel.java
index 608dc75..82e43af 100644
--- a/src/net/java/sip/communicator/impl/neomedia/ZrtpConfigureTableModel.java
+++ b/src/net/java/sip/communicator/impl/neomedia/ZrtpConfigureTableModel.java
@@ -6,12 +6,12 @@
  */
 package net.java.sip.communicator.impl.neomedia;
 
+import gnu.java.zrtp.*;
+
 import java.util.*;
 
 import javax.swing.table.*;
 
-import gnu.java.zrtp.*;
-
 /**
  * @author Werner Dittmann
  */
diff --git a/src/net/java/sip/communicator/impl/netaddr/NetaddrActivator.java b/src/net/java/sip/communicator/impl/netaddr/NetaddrActivator.java
index 4109f25..e0b10df 100644
--- a/src/net/java/sip/communicator/impl/netaddr/NetaddrActivator.java
+++ b/src/net/java/sip/communicator/impl/netaddr/NetaddrActivator.java
@@ -6,10 +6,10 @@
  */
 package net.java.sip.communicator.impl.netaddr;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.netaddr.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.packetlogging.*;
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/impl/netaddr/NetworkConfigurationWatcher.java b/src/net/java/sip/communicator/impl/netaddr/NetworkConfigurationWatcher.java
index 18121ec..502ee39 100644
--- a/src/net/java/sip/communicator/impl/netaddr/NetworkConfigurationWatcher.java
+++ b/src/net/java/sip/communicator/impl/netaddr/NetworkConfigurationWatcher.java
@@ -14,6 +14,7 @@ import net.java.sip.communicator.service.netaddr.event.*;
 import net.java.sip.communicator.service.sysactivity.*;
 import net.java.sip.communicator.service.sysactivity.event.*;
 import net.java.sip.communicator.util.*;
+
 import org.osgi.framework.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/netaddr/NetworkEventDispatcher.java b/src/net/java/sip/communicator/impl/netaddr/NetworkEventDispatcher.java
index a4c057e..6b219aa 100644
--- a/src/net/java/sip/communicator/impl/netaddr/NetworkEventDispatcher.java
+++ b/src/net/java/sip/communicator/impl/netaddr/NetworkEventDispatcher.java
@@ -6,11 +6,11 @@
  */
 package net.java.sip.communicator.impl.netaddr;
 
+import java.util.*;
+
 import net.java.sip.communicator.service.netaddr.event.*;
 import net.java.sip.communicator.util.*;
 
-import java.util.*;
-
 /**
  * The class implements a dispatch event thread. The thread will
  * fire event every time it is added through the <tt>fireChangeEvent()</tt>
diff --git a/src/net/java/sip/communicator/impl/notification/LogMessageNotificationHandlerImpl.java b/src/net/java/sip/communicator/impl/notification/LogMessageNotificationHandlerImpl.java
index 7ac671b..2a9e778 100644
--- a/src/net/java/sip/communicator/impl/notification/LogMessageNotificationHandlerImpl.java
+++ b/src/net/java/sip/communicator/impl/notification/LogMessageNotificationHandlerImpl.java
@@ -6,9 +6,11 @@
  */
 package net.java.sip.communicator.impl.notification;
 
+import static net.java.sip.communicator.service.notification.LogMessageNotificationAction.ERROR_LOG_TYPE;
+import static net.java.sip.communicator.service.notification.LogMessageNotificationAction.INFO_LOG_TYPE;
+import static net.java.sip.communicator.service.notification.LogMessageNotificationAction.TRACE_LOG_TYPE;
 import net.java.sip.communicator.service.notification.*;
 import net.java.sip.communicator.util.*;
-import static net.java.sip.communicator.service.notification.LogMessageNotificationAction.*;
 
 /**
  * An implementation of the <tt>LogMessageNotificationHandler</tt> interface.
diff --git a/src/net/java/sip/communicator/impl/osdependent/SystemTray.java b/src/net/java/sip/communicator/impl/osdependent/SystemTray.java
index 22728f8..21bd64b 100644
--- a/src/net/java/sip/communicator/impl/osdependent/SystemTray.java
+++ b/src/net/java/sip/communicator/impl/osdependent/SystemTray.java
@@ -11,7 +11,9 @@ import java.lang.reflect.*;
 

 import javax.swing.*;

 

-import net.java.sip.communicator.impl.osdependent.TrayIcon.*;

+import net.java.sip.communicator.impl.osdependent.TrayIcon.AWTTrayIconPeer;

+import net.java.sip.communicator.impl.osdependent.TrayIcon.JdicTrayIconPeer;

+import net.java.sip.communicator.impl.osdependent.TrayIcon.TrayIconPeer;

 import net.java.sip.communicator.util.*;

 

 /**

diff --git a/src/net/java/sip/communicator/impl/osdependent/jdic/StatusSubMenu.java b/src/net/java/sip/communicator/impl/osdependent/jdic/StatusSubMenu.java
index a4e8adf..a6ec0e8 100644
--- a/src/net/java/sip/communicator/impl/osdependent/jdic/StatusSubMenu.java
+++ b/src/net/java/sip/communicator/impl/osdependent/jdic/StatusSubMenu.java
@@ -7,7 +7,7 @@
 package net.java.sip.communicator.impl.osdependent.jdic;
 
 import java.awt.*;
-import java.beans.PropertyChangeEvent;
+import java.beans.*;
 import java.util.*;
 
 import javax.swing.*;
diff --git a/src/net/java/sip/communicator/impl/packetlogging/PacketLoggingConfigurationImpl.java b/src/net/java/sip/communicator/impl/packetlogging/PacketLoggingConfigurationImpl.java
index 809ee2e..3f7e896 100644
--- a/src/net/java/sip/communicator/impl/packetlogging/PacketLoggingConfigurationImpl.java
+++ b/src/net/java/sip/communicator/impl/packetlogging/PacketLoggingConfigurationImpl.java
@@ -7,7 +7,6 @@
 package net.java.sip.communicator.impl.packetlogging;
 
 import org.jitsi.service.configuration.*;
-
 import org.jitsi.service.packetlogging.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/packetlogging/PacketLoggingServiceImpl.java b/src/net/java/sip/communicator/impl/packetlogging/PacketLoggingServiceImpl.java
index 08d80b6..d063d8c 100644
--- a/src/net/java/sip/communicator/impl/packetlogging/PacketLoggingServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/packetlogging/PacketLoggingServiceImpl.java
@@ -12,8 +12,6 @@ import java.util.*;
 import net.java.sip.communicator.util.*;
 
 import org.jitsi.service.packetlogging.*;
-import org.jitsi.service.packetlogging.PacketLoggingService.ProtocolName;
-import org.jitsi.service.packetlogging.PacketLoggingService.TransportName;
 
 /**
  * Packet Logging Service implementation dumping logs in
diff --git a/src/net/java/sip/communicator/impl/protocol/dict/DictAccountID.java b/src/net/java/sip/communicator/impl/protocol/dict/DictAccountID.java
index 651e09e..8fbecf5 100644
--- a/src/net/java/sip/communicator/impl/protocol/dict/DictAccountID.java
+++ b/src/net/java/sip/communicator/impl/protocol/dict/DictAccountID.java
@@ -6,9 +6,9 @@
  */
 package net.java.sip.communicator.impl.protocol.dict;
 
-import net.java.sip.communicator.service.protocol.*;
+import java.util.*;
 
-import java.util.Map;
+import net.java.sip.communicator.service.protocol.*;
 
 /**
  * The Dict implementation of a sip-communicator account id.
diff --git a/src/net/java/sip/communicator/impl/protocol/dict/OperationSetBasicInstantMessagingDictImpl.java b/src/net/java/sip/communicator/impl/protocol/dict/OperationSetBasicInstantMessagingDictImpl.java
index 676f8c1..872e3bc 100644
--- a/src/net/java/sip/communicator/impl/protocol/dict/OperationSetBasicInstantMessagingDictImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/dict/OperationSetBasicInstantMessagingDictImpl.java
@@ -11,7 +11,7 @@ import java.util.*;
 import net.java.dict4j.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
-import net.java.sip.communicator.util.Html2Text;
+import net.java.sip.communicator.util.*;
 
 /**
  * Instant messaging functionalities for the Dict protocol.
diff --git a/src/net/java/sip/communicator/impl/protocol/gibberish/GibberishAccountID.java b/src/net/java/sip/communicator/impl/protocol/gibberish/GibberishAccountID.java
index f35200f..5fe3840 100644
--- a/src/net/java/sip/communicator/impl/protocol/gibberish/GibberishAccountID.java
+++ b/src/net/java/sip/communicator/impl/protocol/gibberish/GibberishAccountID.java
@@ -6,8 +6,9 @@
  */
 package net.java.sip.communicator.impl.protocol.gibberish;
 
+import java.util.*;
+
 import net.java.sip.communicator.service.protocol.*;
-import java.util.Map;
 
 /**
  * The Gibberish implementation of a sip-communicator account id.
diff --git a/src/net/java/sip/communicator/impl/protocol/gibberish/GibberishStatusEnum.java b/src/net/java/sip/communicator/impl/protocol/gibberish/GibberishStatusEnum.java
index d652430..00cb67d 100644
--- a/src/net/java/sip/communicator/impl/protocol/gibberish/GibberishStatusEnum.java
+++ b/src/net/java/sip/communicator/impl/protocol/gibberish/GibberishStatusEnum.java
@@ -6,11 +6,11 @@
  */
 package net.java.sip.communicator.impl.protocol.gibberish;
 
+import java.io.*;
 import java.util.*;
 
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
-import java.io.*;
 
 /**
  * An implementation of <tt>PresenceStatus</tt> that enumerates all states that
diff --git a/src/net/java/sip/communicator/impl/protocol/gibberish/ProtocolProviderFactoryGibberishImpl.java b/src/net/java/sip/communicator/impl/protocol/gibberish/ProtocolProviderFactoryGibberishImpl.java
index eea3d50..524eadd 100644
--- a/src/net/java/sip/communicator/impl/protocol/gibberish/ProtocolProviderFactoryGibberishImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/gibberish/ProtocolProviderFactoryGibberishImpl.java
@@ -8,10 +8,10 @@ package net.java.sip.communicator.impl.protocol.gibberish;
 
 import java.util.*;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.protocol.*;
 
+import org.osgi.framework.*;
+
 /**
  * The Gibberish protocol provider factory creates instances of the Gibberish
  * protocol provider service. One Service instance corresponds to one account.
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/AdHocChatRoomIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/AdHocChatRoomIcqImpl.java
index 9e16408..ea43340 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/AdHocChatRoomIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/AdHocChatRoomIcqImpl.java
@@ -6,7 +6,7 @@
 package net.java.sip.communicator.impl.protocol.icq;
 
 import java.util.*;
-import java.util.Map.*;
+import java.util.Map.Entry;
 
 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/icq/IcqActivator.java b/src/net/java/sip/communicator/impl/protocol/icq/IcqActivator.java
index d201caf..50fe9ec 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/IcqActivator.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/IcqActivator.java
@@ -2,9 +2,9 @@ package net.java.sip.communicator.impl.protocol.icq;
 
 import java.util.*;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.protocol.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/IncomingFileTransferRequestIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/IncomingFileTransferRequestIcqImpl.java
index 7213301..7e50f40 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/IncomingFileTransferRequestIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/IncomingFileTransferRequestIcqImpl.java
@@ -6,14 +6,13 @@
  */
 package net.java.sip.communicator.impl.protocol.icq;
 
-import java.io.File;
+import java.io.*;
 import java.util.*;
 
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.FileTransfer;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
-
 import net.kano.joscar.rvcmd.*;
 import net.kano.joustsim.oscar.oscar.service.icbm.ft.*;
 
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/InfoRetreiver.java b/src/net/java/sip/communicator/impl/protocol/icq/InfoRetreiver.java
index f4da152..89a4649 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/InfoRetreiver.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/InfoRetreiver.java
@@ -10,7 +10,7 @@ import java.net.*;
 import java.util.*;
 
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.protocol.ServerStoredDetails.*;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.GenericDetail;
 import net.java.sip.communicator.util.*;
 import net.kano.joscar.flapcmd.*;
 import net.kano.joscar.snac.*;
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetAdHocMultiUserChatIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetAdHocMultiUserChatIcqImpl.java
index 95c22c3..dd061eb 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetAdHocMultiUserChatIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetAdHocMultiUserChatIcqImpl.java
@@ -9,7 +9,7 @@ import java.util.*;
 
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
-import net.java.sip.communicator.util.Logger;
+import net.java.sip.communicator.util.*;
 import net.kano.joscar.*;
 import net.kano.joustsim.oscar.oscar.service.chatrooms.*;
 
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetBasicInstantMessagingIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetBasicInstantMessagingIcqImpl.java
index 1ba7b4f..68e6905 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetBasicInstantMessagingIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetBasicInstantMessagingIcqImpl.java
@@ -11,6 +11,7 @@ import java.util.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.Message;
 import net.java.sip.communicator.service.protocol.event.*;
+import net.java.sip.communicator.service.protocol.icqconstants.*;
 import net.java.sip.communicator.util.*;
 import net.kano.joscar.*;
 import net.kano.joscar.flapcmd.*;
@@ -19,7 +20,6 @@ import net.kano.joscar.snaccmd.error.*;
 import net.kano.joscar.snaccmd.icq.*;
 import net.kano.joustsim.*;
 import net.kano.joustsim.oscar.oscar.service.icbm.*;
-import net.java.sip.communicator.service.protocol.icqconstants.*;
 
 /**
  * A straightforward implementation of the basic instant messaging operation
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetExtendedAuthorizationsIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetExtendedAuthorizationsIcqImpl.java
index d9e1ac2..9826226 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetExtendedAuthorizationsIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetExtendedAuthorizationsIcqImpl.java
@@ -7,7 +7,7 @@
 package net.java.sip.communicator.impl.protocol.icq;
 
 import net.java.sip.communicator.service.protocol.*;
-import net.kano.joustsim.Screenname;
+import net.kano.joustsim.*;
 
 /**
  * Contains methods that would allow service users to re-request authorizations
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetFileTransferIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetFileTransferIcqImpl.java
index 433a1f1..5201fd7 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetFileTransferIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetFileTransferIcqImpl.java
@@ -9,11 +9,10 @@ package net.java.sip.communicator.impl.protocol.icq;
 import java.io.*;
 import java.util.*;
 
-import net.java.sip.communicator.service.protocol.FileTransfer;
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.service.protocol.FileTransfer;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
-
 import net.kano.joscar.rvcmd.*;
 import net.kano.joustsim.*;
 import net.kano.joustsim.oscar.*;
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetServerStoredAccountInfoIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetServerStoredAccountInfoIcqImpl.java
index 8391181..f4c08cd 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetServerStoredAccountInfoIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetServerStoredAccountInfoIcqImpl.java
@@ -10,7 +10,12 @@ import java.io.*;
 import java.util.*;
 
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.protocol.ServerStoredDetails.*;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.BirthDateDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.CountryDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.GenericDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.ImageDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.SpokenLanguageDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.StringDetail;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 import net.kano.joscar.*;
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetServerStoredContactInfoIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetServerStoredContactInfoIcqImpl.java
index 5525508..593b39c 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetServerStoredContactInfoIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetServerStoredContactInfoIcqImpl.java
@@ -9,7 +9,8 @@ package net.java.sip.communicator.impl.protocol.icq;
 import java.util.*;
 
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.protocol.ServerStoredDetails.*;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.GenericDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.ImageDetail;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/protocol/irc/ChatRoomIrcImpl.java b/src/net/java/sip/communicator/impl/protocol/irc/ChatRoomIrcImpl.java
index 824c17e..bf03ba4 100644
--- a/src/net/java/sip/communicator/impl/protocol/irc/ChatRoomIrcImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/irc/ChatRoomIrcImpl.java
@@ -6,7 +6,7 @@
  */
 package net.java.sip.communicator.impl.protocol.irc;
 
-import java.beans.PropertyChangeEvent;
+import java.beans.*;
 import java.util.*;
 
 import net.java.sip.communicator.service.protocol.*;
diff --git a/src/net/java/sip/communicator/impl/protocol/irc/IrcAccountID.java b/src/net/java/sip/communicator/impl/protocol/irc/IrcAccountID.java
index fe632d4..8b42571 100644
--- a/src/net/java/sip/communicator/impl/protocol/irc/IrcAccountID.java
+++ b/src/net/java/sip/communicator/impl/protocol/irc/IrcAccountID.java
@@ -6,9 +6,9 @@
  */
 package net.java.sip.communicator.impl.protocol.irc;
 
-import net.java.sip.communicator.service.protocol.*;
+import java.util.*;
 
-import java.util.Map;
+import net.java.sip.communicator.service.protocol.*;
 
 /**
  * The IRC implementation of a sip-communicator AccountID.
diff --git a/src/net/java/sip/communicator/impl/protocol/irc/ProtocolProviderFactoryIrcImpl.java b/src/net/java/sip/communicator/impl/protocol/irc/ProtocolProviderFactoryIrcImpl.java
index b899087..61bed27 100644
--- a/src/net/java/sip/communicator/impl/protocol/irc/ProtocolProviderFactoryIrcImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/irc/ProtocolProviderFactoryIrcImpl.java
@@ -8,10 +8,10 @@ package net.java.sip.communicator.impl.protocol.irc;
 
 import java.util.*;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.protocol.*;
 
+import org.osgi.framework.*;
+
 /**
  * The IRC protocol provider factory creates instances of the IRC protocol
  * provider service. One Service instance corresponds to one account.
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/CallGTalkImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/CallGTalkImpl.java
index c067c51..e2c34a7 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/CallGTalkImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/CallGTalkImpl.java
@@ -8,14 +8,14 @@ package net.java.sip.communicator.impl.protocol.jabber;
 
 import java.util.*;
 
-import org.jivesoftware.smack.packet.*;
-
 import net.java.sip.communicator.impl.protocol.jabber.extensions.gtalk.*;
 import net.java.sip.communicator.impl.protocol.jabber.extensions.jingle.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.service.protocol.media.*;
 
+import org.jivesoftware.smack.packet.*;
+
 /**
  * A Google Talk implementation of the <tt>Call</tt> abstract class
  * encapsulating Google Talk sessions.
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerGTalkImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerGTalkImpl.java
index c3ca605..a348b66 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerGTalkImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerGTalkImpl.java
@@ -9,8 +9,6 @@ package net.java.sip.communicator.impl.protocol.jabber;
 import java.lang.reflect.*;
 import java.util.*;
 
-import org.jivesoftware.smack.packet.*;
-
 import net.java.sip.communicator.impl.protocol.jabber.extensions.gtalk.*;
 import net.java.sip.communicator.impl.protocol.jabber.extensions.jingle.*;
 import net.java.sip.communicator.service.protocol.*;
@@ -18,6 +16,8 @@ import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.service.protocol.media.*;
 import net.java.sip.communicator.util.*;
 
+import org.jivesoftware.smack.packet.*;
+
 /**
  * Implements a Google Talk <tt>CallPeer</tt>.
  *
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomConfigurationFormFieldJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomConfigurationFormFieldJabberImpl.java
index cb73a3c..418f54d 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomConfigurationFormFieldJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomConfigurationFormFieldJabberImpl.java
@@ -8,10 +8,10 @@ package net.java.sip.communicator.impl.protocol.jabber;
 
 import java.util.*;
 
-import org.jivesoftware.smackx.*;
-
 import net.java.sip.communicator.service.protocol.*;
 
+import org.jivesoftware.smackx.*;
+
 /**
  * The Jabber protocol implementation of the
  * <tt>ChatRoomConfigurationFormField</tt>. This implementation is based on the
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomJabberImpl.java
index c85bf0d..1c51d7d 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomJabberImpl.java
@@ -6,7 +6,7 @@
  */
 package net.java.sip.communicator.impl.protocol.jabber;
 
-import java.beans.PropertyChangeEvent;
+import java.beans.*;
 import java.util.*;
 
 import net.java.sip.communicator.service.protocol.*;
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomMemberJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomMemberJabberImpl.java
index 68aa076..395eac2 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomMemberJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomMemberJabberImpl.java
@@ -6,11 +6,11 @@
  */
 package net.java.sip.communicator.impl.protocol.jabber;
 
-import org.jivesoftware.smackx.muc.*;
-import org.jivesoftware.smack.util.*;
-
 import net.java.sip.communicator.service.protocol.*;
 
+import org.jivesoftware.smack.util.*;
+import org.jivesoftware.smackx.muc.*;
+
 /**
  * A Jabber implementation of the chat room member.
  *
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ContactGroupJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ContactGroupJabberImpl.java
index 1f19dd7..3054e5d 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/ContactGroupJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/ContactGroupJabberImpl.java
@@ -8,10 +8,10 @@ package net.java.sip.communicator.impl.protocol.jabber;
 
 import java.util.*;
 
-import org.jivesoftware.smack.*;
-
 import net.java.sip.communicator.service.protocol.*;
 
+import org.jivesoftware.smack.*;
+
 /**
  * The Jabber implementation of the ContactGroup interface. Instances of this class
  * (contrary to <tt>RootContactGroupJabberImpl</tt>) may only contain buddies
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ContactJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ContactJabberImpl.java
index 83c6114..935fa9e 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/ContactJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/ContactJabberImpl.java
@@ -6,11 +6,11 @@
  */
 package net.java.sip.communicator.impl.protocol.jabber;
 
-import org.jivesoftware.smack.*;
-
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.jabberconstants.*;
 
+import org.jivesoftware.smack.*;
+
 /**
  * The Jabber implementation of the service.protocol.Contact interface.
  *
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/FailoverConnectionMonitor.java b/src/net/java/sip/communicator/impl/protocol/jabber/FailoverConnectionMonitor.java
index b4657b2..bc4b5b3 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/FailoverConnectionMonitor.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/FailoverConnectionMonitor.java
@@ -6,12 +6,13 @@
  */
 package net.java.sip.communicator.impl.protocol.jabber;
 
+import java.util.*;
+
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
-import org.jivesoftware.smack.*;
 
-import java.util.*;
+import org.jivesoftware.smack.*;
 
 /**
  * When provider registers, check whether we are connected
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/IncomingFileTransferJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/IncomingFileTransferJabberImpl.java
index 9133d9d..854fc0c 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/IncomingFileTransferJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/IncomingFileTransferJabberImpl.java
@@ -8,10 +8,10 @@ package net.java.sip.communicator.impl.protocol.jabber;
 
 import java.io.*;
 
-import org.jivesoftware.smackx.filetransfer.*;
-
 import net.java.sip.communicator.service.protocol.*;
 
+import org.jivesoftware.smackx.filetransfer.*;
+
 /**
  * The Jabber protocol extension of the <tt>AbstractFileTransfer</tt>.
  * 
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/InfoRetreiver.java b/src/net/java/sip/communicator/impl/protocol/jabber/InfoRetreiver.java
index b7bfc5b..d9cf19f 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/InfoRetreiver.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/InfoRetreiver.java
@@ -9,9 +9,10 @@ package net.java.sip.communicator.impl.protocol.jabber;
 import java.lang.reflect.*;
 import java.util.*;
 
-import net.java.sip.communicator.service.protocol.ServerStoredDetails;
-import net.java.sip.communicator.service.protocol.ServerStoredDetails.*;
+import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.GenericDetail;
 import net.java.sip.communicator.util.*;
+
 import org.jivesoftware.smack.*;
 import org.jivesoftware.smack.filter.*;
 import org.jivesoftware.smack.packet.*;
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/JingleNodesCandidateDatagramSocket.java b/src/net/java/sip/communicator/impl/protocol/jabber/JingleNodesCandidateDatagramSocket.java
index 4d88eca..70a1c0c 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/JingleNodesCandidateDatagramSocket.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/JingleNodesCandidateDatagramSocket.java
@@ -6,11 +6,10 @@
  */
 package net.java.sip.communicator.impl.protocol.jabber;
 
-import java.io.IOException;
+import java.io.*;
 import java.net.*;
 
 import org.ice4j.*;
-import org.ice4j.stack.*;
 import org.ice4j.socket.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/JingleNodesHarvester.java b/src/net/java/sip/communicator/impl/protocol/jabber/JingleNodesHarvester.java
index 5147f5e..a6a975c 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/JingleNodesHarvester.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/JingleNodesHarvester.java
@@ -8,16 +8,15 @@ package net.java.sip.communicator.impl.protocol.jabber;
 
 import java.util.*;
 
+import net.java.sip.communicator.util.*;
+
 import org.ice4j.*;
 import org.ice4j.ice.*;
 import org.ice4j.ice.harvest.*;
 import org.ice4j.socket.*;
-
 import org.jivesoftware.smack.*;
 import org.xmpp.jnodes.smack.*;
 
-import net.java.sip.communicator.util.*;
-
 /**
  * Implements a <tt>CandidateHarvester</tt> which gathers <tt>Candidate</tt>s
  * for a specified {@link Component} using Jingle Nodes as defined in
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/JingleNodesServiceDiscovery.java b/src/net/java/sip/communicator/impl/protocol/jabber/JingleNodesServiceDiscovery.java
index c5ba113..1d571a0 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/JingleNodesServiceDiscovery.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/JingleNodesServiceDiscovery.java
@@ -6,16 +6,17 @@
  */
 package net.java.sip.communicator.impl.protocol.jabber;
 
+import java.util.*;
+import java.util.concurrent.*;
+
 import net.java.sip.communicator.util.*;
+
 import org.jivesoftware.smack.*;
 import org.jivesoftware.smack.filter.*;
 import org.jivesoftware.smack.packet.*;
 import org.jivesoftware.smackx.packet.*;
 import org.xmpp.jnodes.smack.*;
 
-import java.util.*;
-import java.util.concurrent.*;
-
 /**
  * Search for jingle nodes.
  *
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetContactCapabilitiesJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetContactCapabilitiesJabberImpl.java
index 9c5282e..b030dfb 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetContactCapabilitiesJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetContactCapabilitiesJabberImpl.java
@@ -8,14 +8,14 @@ package net.java.sip.communicator.impl.protocol.jabber;
 
 import java.util.*;
 
-import org.jivesoftware.smack.packet.*;
-import org.jivesoftware.smack.util.StringUtils;
-
 import net.java.sip.communicator.impl.protocol.jabber.extensions.caps.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 
+import org.jivesoftware.smack.packet.*;
+import org.jivesoftware.smack.util.StringUtils;
+
 /**
  * Represents an <tt>OperationSet</tt> to query the <tt>OperationSet</tt>s
  * supported for a specific Jabber <tt>Contact</tt>. The <tt>OperationSet</tt>s
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetDesktopSharingClientJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetDesktopSharingClientJabberImpl.java
index be2fc93..2543c0d 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetDesktopSharingClientJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetDesktopSharingClientJabberImpl.java
@@ -6,18 +6,19 @@
  */
 package net.java.sip.communicator.impl.protocol.jabber;
 
-import java.awt.Dimension; // disambiguation
+import java.awt.*;
 import java.awt.event.*;
-import java.util.*;
+import java.util.List;
+
+import net.java.sip.communicator.impl.protocol.jabber.extensions.inputevt.*;
+import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.service.protocol.event.*;
 
 import org.jivesoftware.smack.*;
 import org.jivesoftware.smack.filter.*;
 import org.jivesoftware.smack.packet.*;
 import org.jivesoftware.smackx.packet.*;
-
-import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.protocol.event.*;
-import net.java.sip.communicator.impl.protocol.jabber.extensions.inputevt.*;
+// disambiguation
 
 /**
  * Implements all desktop sharing client-side related functions for Jabber
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetExtendedAuthorizationsJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetExtendedAuthorizationsJabberImpl.java
index badf6c7..a1546fe 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetExtendedAuthorizationsJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetExtendedAuthorizationsJabberImpl.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.impl.protocol.jabber;
 
 import net.java.sip.communicator.service.protocol.*;
+
 import org.jivesoftware.smack.*;
 import org.jivesoftware.smack.packet.*;
 
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetFileTransferJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetFileTransferJabberImpl.java
index 05fa517..b4d8e52 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetFileTransferJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetFileTransferJabberImpl.java
@@ -22,8 +22,8 @@ import org.jivesoftware.smack.*;
 import org.jivesoftware.smack.filter.*;
 import org.jivesoftware.smack.packet.*;
 import org.jivesoftware.smack.provider.*;
+import org.jivesoftware.smackx.filetransfer.FileTransfer.Status;
 import org.jivesoftware.smackx.filetransfer.*;
-import org.jivesoftware.smackx.filetransfer.FileTransfer.*;
 import org.jivesoftware.smackx.packet.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetGenericNotificationsJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetGenericNotificationsJabberImpl.java
index dd458cb..7795eca 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetGenericNotificationsJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetGenericNotificationsJabberImpl.java
@@ -6,18 +6,19 @@
  */
 package net.java.sip.communicator.impl.protocol.jabber;
 
+import java.util.*;
+
+import net.java.sip.communicator.impl.protocol.jabber.extensions.notification.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
-import net.java.sip.communicator.impl.protocol.jabber.extensions.notification.*;
 import net.java.sip.communicator.util.*;
+
 import org.jivesoftware.smack.*;
 import org.jivesoftware.smack.filter.*;
+import org.jivesoftware.smack.packet.IQ.Type;
 import org.jivesoftware.smack.packet.*;
-import org.jivesoftware.smack.packet.IQ.*;
 import org.jivesoftware.smack.provider.*;
 
-import java.util.*;
-
 /**
  * Provides notification for generic events with name and value, also
  * option to generate such events.
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetGeolocationJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetGeolocationJabberImpl.java
index a8f37d6..134ad4c 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetGeolocationJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetGeolocationJabberImpl.java
@@ -8,17 +8,17 @@ package net.java.sip.communicator.impl.protocol.jabber;
 
 import java.util.*;
 
+import net.java.sip.communicator.impl.protocol.jabber.extensions.geolocation.*;
+import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.service.protocol.event.*;
+import net.java.sip.communicator.util.*;
+
 import org.jivesoftware.smack.*;
 import org.jivesoftware.smack.filter.*;
 import org.jivesoftware.smack.packet.*;
 import org.jivesoftware.smack.provider.*;
 import org.jivesoftware.smack.util.StringUtils;
 
-import net.java.sip.communicator.impl.protocol.jabber.extensions.geolocation.*;
-import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.protocol.event.*;
-import net.java.sip.communicator.util.*;
-
 /**
  * The Jabber implementation of an OperationSetGeolocation done with the
  * XEP-0080: User Geolocation. This class broadcast our own geolocation and
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java
index 27b8e25..61ae300 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java
@@ -16,8 +16,9 @@ import net.java.sip.communicator.util.*;
 import org.jivesoftware.smack.*;
 import org.jivesoftware.smack.filter.*;
 import org.jivesoftware.smack.packet.*;
-import org.jivesoftware.smack.util.StringUtils; // disambiguation
+import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smackx.packet.*;
+// disambiguation
 
 /**
  * The Jabber implementation of a Persistent Presence Operation set. This class
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetServerStoredAccountInfoJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetServerStoredAccountInfoJabberImpl.java
index 8431277..9d148e8 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetServerStoredAccountInfoJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetServerStoredAccountInfoJabberImpl.java
@@ -9,10 +9,11 @@ package net.java.sip.communicator.impl.protocol.jabber;
 import java.util.*;
 
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.GenericDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.ImageDetail;
 import net.java.sip.communicator.service.protocol.event.*;
-import net.java.sip.communicator.service.protocol.ServerStoredDetails.*;
-
 import net.java.sip.communicator.util.*;
+
 import org.jivesoftware.smack.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetServerStoredContactInfoJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetServerStoredContactInfoJabberImpl.java
index 8eac3b3..856dfea 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetServerStoredContactInfoJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetServerStoredContactInfoJabberImpl.java
@@ -9,7 +9,7 @@ package net.java.sip.communicator.impl.protocol.jabber;
 import java.util.*;
 
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.protocol.ServerStoredDetails.*;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.GenericDetail;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/P2PTransportManager.java b/src/net/java/sip/communicator/impl/protocol/jabber/P2PTransportManager.java
index 17ff56e..fbccca1 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/P2PTransportManager.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/P2PTransportManager.java
@@ -8,15 +8,15 @@ package net.java.sip.communicator.impl.protocol.jabber;
 
 import java.util.*;
 
-import org.ice4j.*;
-import org.ice4j.ice.*;
-import org.jivesoftware.smack.packet.*;
-
 import net.java.sip.communicator.impl.protocol.jabber.extensions.gtalk.*;
 import net.java.sip.communicator.impl.protocol.jabber.extensions.jingle.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
+import org.ice4j.*;
+import org.ice4j.ice.*;
+import org.jivesoftware.smack.packet.*;
+
 /**
  * Google P2P TransportManager.
  *
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
index a6e3b72..f12abe1 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
@@ -12,35 +12,35 @@ import java.security.*;
 import java.security.cert.*;
 import java.text.*;
 import java.util.*;
+
 import javax.net.ssl.*;
 
 import net.java.sip.communicator.impl.protocol.jabber.debugger.*;
 import net.java.sip.communicator.impl.protocol.jabber.extensions.*;
+import net.java.sip.communicator.impl.protocol.jabber.extensions.caps.*;
 import net.java.sip.communicator.impl.protocol.jabber.extensions.cobri.*;
+import net.java.sip.communicator.impl.protocol.jabber.extensions.coin.*;
+import net.java.sip.communicator.impl.protocol.jabber.extensions.gtalk.*;
+import net.java.sip.communicator.impl.protocol.jabber.extensions.inputevt.*;
+import net.java.sip.communicator.impl.protocol.jabber.extensions.jingle.*;
+import net.java.sip.communicator.impl.protocol.jabber.extensions.jingleinfo.*;
 import net.java.sip.communicator.impl.protocol.jabber.extensions.keepalive.*;
 import net.java.sip.communicator.impl.protocol.jabber.extensions.version.*;
+import net.java.sip.communicator.impl.protocol.jabber.sasl.*;
+import net.java.sip.communicator.service.certificate.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.service.protocol.jabberconstants.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.dns.*;
-import net.java.sip.communicator.impl.protocol.jabber.extensions.jingle.*;
-import net.java.sip.communicator.impl.protocol.jabber.extensions.jingleinfo.*;
-import net.java.sip.communicator.impl.protocol.jabber.extensions.gtalk.*;
-import net.java.sip.communicator.impl.protocol.jabber.extensions.inputevt.*;
-import net.java.sip.communicator.impl.protocol.jabber.extensions.caps.*;
-import net.java.sip.communicator.impl.protocol.jabber.extensions.coin.*;
-import net.java.sip.communicator.impl.protocol.jabber.sasl.*;
-import net.java.sip.communicator.service.certificate.*;
-import org.jitsi.service.configuration.*;
 
+import org.jitsi.service.configuration.*;
 import org.jivesoftware.smack.*;
 import org.jivesoftware.smack.packet.*;
 import org.jivesoftware.smack.provider.*;
 import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smackx.*;
 import org.jivesoftware.smackx.packet.*;
-
 import org.osgi.framework.*;
 import org.xmpp.jnodes.smack.*;
 
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ProviderManagerExt.java b/src/net/java/sip/communicator/impl/protocol/jabber/ProviderManagerExt.java
index fe36a60..0b1721d 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/ProviderManagerExt.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/ProviderManagerExt.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.impl.protocol.jabber;
 
 import net.java.sip.communicator.util.*;
+
 import org.jivesoftware.smack.packet.*;
 import org.jivesoftware.smack.provider.*;
 import org.jivesoftware.smackx.*;
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ServerStoredContactListJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ServerStoredContactListJabberImpl.java
index 31c74de..01e36a6 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/ServerStoredContactListJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/ServerStoredContactListJabberImpl.java
@@ -14,9 +14,8 @@ import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 
 import org.jivesoftware.smack.*;
-import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smack.packet.*;
-import org.jivesoftware.smackx.packet.*;
+import org.jivesoftware.smack.util.StringUtils;
 import org.osgi.framework.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/UriHandlerJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/UriHandlerJabberImpl.java
index b7281d6..dbe4d77 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/UriHandlerJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/UriHandlerJabberImpl.java
@@ -8,14 +8,14 @@ package net.java.sip.communicator.impl.protocol.jabber;
 import java.util.*;
 import java.util.regex.*;
 
-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.*;
 
+import org.osgi.framework.*;
+
 /**
  * The jabber implementation of the URI handler. This class handles xmpp URIs by
  * trying to establish a chat with them or add you to a chatroom.
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/caps/EntityCapsManager.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/caps/EntityCapsManager.java
index 1142b38..b8e9bf0 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/caps/EntityCapsManager.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/caps/EntityCapsManager.java
@@ -13,19 +13,21 @@ import java.util.*;
 import java.util.concurrent.*;
 
 import net.java.sip.communicator.impl.protocol.jabber.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.util.Logger; // disambiguation
+import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.jivesoftware.smack.*;
 import org.jivesoftware.smack.filter.*;
 import org.jivesoftware.smack.packet.*;
 import org.jivesoftware.smack.provider.*;
-import org.jivesoftware.smack.util.*;
+import org.jivesoftware.smack.util.Base64;
+import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smackx.*;
 import org.jivesoftware.smackx.packet.*;
 import org.xmlpull.mxp1.*;
 import org.xmlpull.v1.*;
+// disambiguation
 
 /**
  * Keeps track of entity capabilities.
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/ConferenceMediumPacketExtension.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/ConferenceMediumPacketExtension.java
index aa2c3c5..44fe549 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/ConferenceMediumPacketExtension.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/ConferenceMediumPacketExtension.java
@@ -8,10 +8,10 @@ package net.java.sip.communicator.impl.protocol.jabber.extensions.coin;
 
 import java.util.*;
 
-import org.jivesoftware.smack.packet.*;
-
 import net.java.sip.communicator.impl.protocol.jabber.extensions.*;
 
+import org.jivesoftware.smack.packet.*;
+
 /**
  * Conference medium packet extension.
  *
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/DescriptionPacketExtension.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/DescriptionPacketExtension.java
index edcfd17..7fefb30 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/DescriptionPacketExtension.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/DescriptionPacketExtension.java
@@ -8,10 +8,10 @@ package net.java.sip.communicator.impl.protocol.jabber.extensions.coin;
 
 import java.util.*;
 
-import org.jivesoftware.smack.packet.*;
-
 import net.java.sip.communicator.impl.protocol.jabber.extensions.*;
 
+import org.jivesoftware.smack.packet.*;
+
 /**
  * Description packet extension.
  *
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/EndpointPacketExtension.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/EndpointPacketExtension.java
index cd004e9..5c28bc3 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/EndpointPacketExtension.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/EndpointPacketExtension.java
@@ -8,10 +8,10 @@ package net.java.sip.communicator.impl.protocol.jabber.extensions.coin;
 
 import java.util.*;
 
-import org.jivesoftware.smack.packet.*;
-
 import net.java.sip.communicator.impl.protocol.jabber.extensions.*;
 
+import org.jivesoftware.smack.packet.*;
+
 /**
  * Endpoint packet extension.
  *
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/ExecutionPacketExtension.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/ExecutionPacketExtension.java
index 8042861..dd20a8e 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/ExecutionPacketExtension.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/ExecutionPacketExtension.java
@@ -8,10 +8,10 @@ package net.java.sip.communicator.impl.protocol.jabber.extensions.coin;
 
 import java.util.*;
 
-import org.jivesoftware.smack.packet.*;
-
 import net.java.sip.communicator.impl.protocol.jabber.extensions.*;
 
+import org.jivesoftware.smack.packet.*;
+
 /**
  * Execution packet extension.
  *
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/HostInfoPacketExtension.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/HostInfoPacketExtension.java
index 2269c03..54e1f90 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/HostInfoPacketExtension.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/HostInfoPacketExtension.java
@@ -8,10 +8,10 @@ package net.java.sip.communicator.impl.protocol.jabber.extensions.coin;
 
 import java.util.*;
 
-import org.jivesoftware.smack.packet.*;
-
 import net.java.sip.communicator.impl.protocol.jabber.extensions.*;
 
+import org.jivesoftware.smack.packet.*;
+
 /**
  * Host Information packet extension.
  *
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/MediaPacketExtension.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/MediaPacketExtension.java
index 208217f..19d4ea1 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/MediaPacketExtension.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/MediaPacketExtension.java
@@ -8,10 +8,10 @@ package net.java.sip.communicator.impl.protocol.jabber.extensions.coin;
 
 import java.util.*;
 
-import org.jivesoftware.smack.packet.*;
-
 import net.java.sip.communicator.impl.protocol.jabber.extensions.*;
 
+import org.jivesoftware.smack.packet.*;
+
 /**
  * Media packet extension.
  *
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/SIPDialogIDPacketExtension.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/SIPDialogIDPacketExtension.java
index 334f658..6143648 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/SIPDialogIDPacketExtension.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/SIPDialogIDPacketExtension.java
@@ -8,10 +8,10 @@ package net.java.sip.communicator.impl.protocol.jabber.extensions.coin;
 
 import java.util.*;
 
-import org.jivesoftware.smack.packet.*;
-
 import net.java.sip.communicator.impl.protocol.jabber.extensions.*;
 
+import org.jivesoftware.smack.packet.*;
+
 /**
  * SIP Dialog ID packet extension.
  *
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/StatePacketExtension.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/StatePacketExtension.java
index a048465..3eda571 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/StatePacketExtension.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/StatePacketExtension.java
@@ -8,10 +8,10 @@ package net.java.sip.communicator.impl.protocol.jabber.extensions.coin;
 
 import java.util.*;
 
-import org.jivesoftware.smack.packet.*;
-
 import net.java.sip.communicator.impl.protocol.jabber.extensions.*;
 
+import org.jivesoftware.smack.packet.*;
+
 /**
  * State packet extension.
  *
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/URIPacketExtension.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/URIPacketExtension.java
index 464a373..3f966e8 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/URIPacketExtension.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/URIPacketExtension.java
@@ -8,10 +8,10 @@ package net.java.sip.communicator.impl.protocol.jabber.extensions.coin;
 
 import java.util.*;
 
-import org.jivesoftware.smack.packet.*;
-
 import net.java.sip.communicator.impl.protocol.jabber.extensions.*;
 
+import org.jivesoftware.smack.packet.*;
+
 /**
  * URI packet extension.
  *
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/UserLanguagesPacketExtension.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/UserLanguagesPacketExtension.java
index c82fe8b..094358d 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/UserLanguagesPacketExtension.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/UserLanguagesPacketExtension.java
@@ -8,10 +8,10 @@ package net.java.sip.communicator.impl.protocol.jabber.extensions.coin;
 
 import java.util.*;
 
-import org.jivesoftware.smack.packet.*;
-
 import net.java.sip.communicator.impl.protocol.jabber.extensions.*;
 
+import org.jivesoftware.smack.packet.*;
+
 /**
  * User languages packet extension.
  *
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/UserPacketExtension.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/UserPacketExtension.java
index 01f6230..f6dca5f 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/UserPacketExtension.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/UserPacketExtension.java
@@ -8,10 +8,10 @@ package net.java.sip.communicator.impl.protocol.jabber.extensions.coin;
 
 import java.util.*;
 
-import org.jivesoftware.smack.packet.*;
-
 import net.java.sip.communicator.impl.protocol.jabber.extensions.*;
 
+import org.jivesoftware.smack.packet.*;
+
 /**
  * User packet extension.
  *
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/UserRolesPacketExtension.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/UserRolesPacketExtension.java
index 0fcd162..c34d799 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/UserRolesPacketExtension.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/UserRolesPacketExtension.java
@@ -8,10 +8,10 @@ package net.java.sip.communicator.impl.protocol.jabber.extensions.coin;
 
 import java.util.*;
 
-import org.jivesoftware.smack.packet.*;
-
 import net.java.sip.communicator.impl.protocol.jabber.extensions.*;
 
+import org.jivesoftware.smack.packet.*;
+
 /**
  * User roles packet extension.
  *
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 310d743..0acb1a6 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
@@ -8,7 +8,7 @@ package net.java.sip.communicator.impl.protocol.jabber.extensions.geolocation;
 
 import java.lang.reflect.*;
 import java.util.*;
-import java.util.Map.*;
+import java.util.Map.Entry;
 
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/geolocation/GeolocationMessage.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/geolocation/GeolocationMessage.java
index 7e1a80b..068feea 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/geolocation/GeolocationMessage.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/geolocation/GeolocationMessage.java
@@ -6,7 +6,7 @@
  */
 package net.java.sip.communicator.impl.protocol.jabber.extensions.geolocation;
 
-import org.jivesoftware.smack.packet.Message;
+import org.jivesoftware.smack.packet.*;
 
 /**
  * This class extends the smack Message class and allows creating a
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/geolocation/GeolocationPacketExtensionProvider.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/geolocation/GeolocationPacketExtensionProvider.java
index acfe9a5..4a14088 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/geolocation/GeolocationPacketExtensionProvider.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/geolocation/GeolocationPacketExtensionProvider.java
@@ -6,11 +6,11 @@
  */
 package net.java.sip.communicator.impl.protocol.jabber.extensions.geolocation;
 
-import net.java.sip.communicator.util.Logger;
+import net.java.sip.communicator.util.*;
 
-import org.jivesoftware.smack.packet.PacketExtension;
-import org.jivesoftware.smack.provider.PacketExtensionProvider;
-import org.xmlpull.v1.XmlPullParser;
+import org.jivesoftware.smack.packet.*;
+import org.jivesoftware.smack.provider.*;
+import org.xmlpull.v1.*;
 
 /**
  * This class parses incoming messages and extracts the geolocation parameters
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 a09d49c..12acca8 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
@@ -6,10 +6,10 @@
  */
 package net.java.sip.communicator.impl.protocol.jabber.extensions.geolocation;
 
+import net.java.sip.communicator.impl.protocol.jabber.*;
 import net.java.sip.communicator.service.protocol.*;
 
 import org.jivesoftware.smack.packet.*;
-import net.java.sip.communicator.impl.protocol.jabber.*;
 
 /**
  * This class represents a Jabber presence message including a Geolocation
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/gtalk/GTalkTransportPacketExtension.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/gtalk/GTalkTransportPacketExtension.java
index e8b2424..9aa220d 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/gtalk/GTalkTransportPacketExtension.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/gtalk/GTalkTransportPacketExtension.java
@@ -8,11 +8,11 @@ package net.java.sip.communicator.impl.protocol.jabber.extensions.gtalk;
 
 import java.util.*;
 
-import org.jivesoftware.smack.packet.*;
-
 import net.java.sip.communicator.impl.protocol.jabber.extensions.*;
 import net.java.sip.communicator.impl.protocol.jabber.extensions.jingle.*;
 
+import org.jivesoftware.smack.packet.*;
+
 /**
  * An {@link AbstractPacketExtension} implementation for transport elements.
  *
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/IceUdpTransportPacketExtension.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/IceUdpTransportPacketExtension.java
index 8840cf0..73fa1d6 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/IceUdpTransportPacketExtension.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/IceUdpTransportPacketExtension.java
@@ -8,10 +8,10 @@ package net.java.sip.communicator.impl.protocol.jabber.extensions.jingle;
 
 import java.util.*;
 
-import org.jivesoftware.smack.packet.*;
-
 import net.java.sip.communicator.impl.protocol.jabber.extensions.*;
 
+import org.jivesoftware.smack.packet.*;
+
 /**
  * An {@link AbstractPacketExtension} implementation for transport elements.
  *
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/JingleIQProvider.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/JingleIQProvider.java
index 4e358e1..e1ab9f3 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/JingleIQProvider.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/JingleIQProvider.java
@@ -10,7 +10,7 @@ import net.java.sip.communicator.impl.protocol.jabber.extensions.*;
 import net.java.sip.communicator.impl.protocol.jabber.extensions.gtalk.*;
 
 import org.jivesoftware.smack.provider.*;
-import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.*;
 
 /**
  * An implementation of a Jingle IQ provider that parses incoming Jingle IQs.
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/RTPHdrExtPacketExtension.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/RTPHdrExtPacketExtension.java
index 253a963..40ce4ad 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/RTPHdrExtPacketExtension.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/RTPHdrExtPacketExtension.java
@@ -8,10 +8,10 @@ package net.java.sip.communicator.impl.protocol.jabber.extensions.jingle;
 
 import java.net.*;
 
-import org.jivesoftware.smack.packet.*;
-
 import net.java.sip.communicator.impl.protocol.jabber.extensions.*;
-import net.java.sip.communicator.impl.protocol.jabber.extensions.jingle.ContentPacketExtension.*;
+import net.java.sip.communicator.impl.protocol.jabber.extensions.jingle.ContentPacketExtension.SendersEnum;
+
+import org.jivesoftware.smack.packet.*;
 
 /**
  * RTP header extension.
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/RawUdpTransportPacketExtension.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/RawUdpTransportPacketExtension.java
index 8a6da53..0fd8e75 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/RawUdpTransportPacketExtension.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/RawUdpTransportPacketExtension.java
@@ -8,10 +8,10 @@ package net.java.sip.communicator.impl.protocol.jabber.extensions.jingle;
 
 import java.util.*;
 
-import org.jivesoftware.smack.packet.*;
-
 import net.java.sip.communicator.impl.protocol.jabber.extensions.*;
 
+import org.jivesoftware.smack.packet.*;
+
 /**
  * An {@link AbstractPacketExtension} implementation for transport elements.
  *
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingleinfo/RelayPacketExtension.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingleinfo/RelayPacketExtension.java
index 4cd73f4..0e6ebcc 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingleinfo/RelayPacketExtension.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingleinfo/RelayPacketExtension.java
@@ -6,10 +6,10 @@
  */
 package net.java.sip.communicator.impl.protocol.jabber.extensions.jingleinfo;
 
-import org.jivesoftware.smack.packet.*;
-
 import net.java.sip.communicator.impl.protocol.jabber.extensions.*;
 
+import org.jivesoftware.smack.packet.*;
+
 /**
  * Relay packet extension.
  *
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/keepalive/KeepAliveManager.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/keepalive/KeepAliveManager.java
index f37c44a..1ee1fef 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/keepalive/KeepAliveManager.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/keepalive/KeepAliveManager.java
@@ -1,15 +1,16 @@
 package net.java.sip.communicator.impl.protocol.jabber.extensions.keepalive;
 
+import java.util.*;
+
 import net.java.sip.communicator.impl.protocol.jabber.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
+
 import org.jivesoftware.smack.*;
 import org.jivesoftware.smack.packet.*;
 import org.jivesoftware.smack.provider.*;
 
-import java.util.*;
-
 /**
  * XEP-0199: XMPP Ping. Tracks received packets and if for some interval
  * there is nothing received.
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/mailnotification/MailboxIQ.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/mailnotification/MailboxIQ.java
index cbf3c90..3b0925d 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/mailnotification/MailboxIQ.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/mailnotification/MailboxIQ.java
@@ -8,9 +8,10 @@ package net.java.sip.communicator.impl.protocol.jabber.extensions.mailnotificati
 
 import java.util.*;
 
-import org.jivesoftware.smack.packet.*;
 import net.java.sip.communicator.util.*;
 
+import org.jivesoftware.smack.packet.*;
+
 /**
  * A straightforward extension of the IQ. A Mailbox object is created via the
  * MailboxProvider. It contains all the information we need to notify the user
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/mailnotification/MailboxIQProvider.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/mailnotification/MailboxIQProvider.java
index 70e75e4..07620e2 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/mailnotification/MailboxIQProvider.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/mailnotification/MailboxIQProvider.java
@@ -6,11 +6,11 @@
  */
 package net.java.sip.communicator.impl.protocol.jabber.extensions.mailnotification;
 
+import net.java.sip.communicator.util.*;
+
 import org.jivesoftware.smack.packet.*;
 import org.jivesoftware.smack.provider.*;
-import org.xmlpull.v1.XmlPullParser;
-
-import net.java.sip.communicator.util.*;
+import org.xmlpull.v1.*;
 
 /**
  * A straightforward implementation of the IQProvider. Parses custom IQ packets.
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/mailnotification/MailboxQueryIQ.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/mailnotification/MailboxQueryIQ.java
index edfa253..08b1fe5 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/mailnotification/MailboxQueryIQ.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/mailnotification/MailboxQueryIQ.java
@@ -6,9 +6,10 @@
  */
 package net.java.sip.communicator.impl.protocol.jabber.extensions.mailnotification;
 
-import org.jivesoftware.smack.packet.*;
 import net.java.sip.communicator.util.*;
 
+import org.jivesoftware.smack.packet.*;
+
 /**
  * A straightforward <tt>IQ</tt> extension. The <tt>QueryNotify</tt> object is
  * used to create queries for the Gmail mail server. It creates a simple
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/mailnotification/NewMailNotificationIQ.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/mailnotification/NewMailNotificationIQ.java
index fd6732d..4b45a19 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/mailnotification/NewMailNotificationIQ.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/mailnotification/NewMailNotificationIQ.java
@@ -6,9 +6,10 @@
  */
 package net.java.sip.communicator.impl.protocol.jabber.extensions.mailnotification;
 
-import org.jivesoftware.smack.packet.*;
 import net.java.sip.communicator.util.*;
 
+import org.jivesoftware.smack.packet.*;
+
 /**
  * A straightforward IQ extension. A <tt>NewMailNotification</tt> object is
  * created via the <tt>NewMailNotificationProvider</tt>. It contains the
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/mailnotification/NewMailNotificationProvider.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/mailnotification/NewMailNotificationProvider.java
index 5e2a1c1..dbe4743 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/mailnotification/NewMailNotificationProvider.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/mailnotification/NewMailNotificationProvider.java
@@ -6,11 +6,11 @@
  */
 package net.java.sip.communicator.impl.protocol.jabber.extensions.mailnotification;
 
+import net.java.sip.communicator.util.*;
+
 import org.jivesoftware.smack.packet.*;
 import org.jivesoftware.smack.provider.*;
-import org.xmlpull.v1.XmlPullParser;
-
-import net.java.sip.communicator.util.*;
+import org.xmlpull.v1.*;
 
 /**
  * A straightforward implementation of an <tt>IQProvider</tt>. Parses custom
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/thumbnail/FileElement.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/thumbnail/FileElement.java
index 934b151..c3194b4 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/thumbnail/FileElement.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/thumbnail/FileElement.java
@@ -10,7 +10,7 @@ import org.jivesoftware.smack.packet.*;
 import org.jivesoftware.smack.provider.*;
 import org.jivesoftware.smack.util.*;
 import org.jivesoftware.smackx.packet.*;
-import org.jivesoftware.smackx.packet.StreamInitiation.*;
+import org.jivesoftware.smackx.packet.StreamInitiation.File;
 import org.jivesoftware.smackx.provider.*;
 import org.xmlpull.v1.*;
 
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/thumbnail/ThumbnailElement.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/thumbnail/ThumbnailElement.java
index d7f7277..9a0d0b4 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/thumbnail/ThumbnailElement.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/thumbnail/ThumbnailElement.java
@@ -11,10 +11,10 @@ import java.security.*;
 
 import javax.xml.parsers.*;
 
-import org.w3c.dom.*;
-
 import net.java.sip.communicator.util.*;
 
+import org.w3c.dom.*;
+
 /**
  * The <tt>ThumbnailElement</tt> represents a "thumbnail" XML element, that is
  * contained in the file element, we're sending to notify for a file transfer.
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectCircleJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectCircleJabberImpl.java
index 8f6036d..89b0fbd 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectCircleJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectCircleJabberImpl.java
@@ -7,14 +7,16 @@
 
 package net.java.sip.communicator.impl.protocol.jabber.extensions.whiteboard;
 
-import net.java.sip.communicator.util.*;
-import java.awt.Color;
+import java.awt.*;
 import java.io.*;
+
 import javax.xml.parsers.*;
-import org.w3c.dom.*;
 
-import net.java.sip.communicator.service.protocol.WhiteboardPoint;
+import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.whiteboardobjects.*;
+import net.java.sip.communicator.util.*;
+
+import org.w3c.dom.*;
 
 /**
  *  WhiteboardObjectCircleJabberImpl
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectImageJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectImageJabberImpl.java
index ad48129..06fa3eb 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectImageJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectImageJabberImpl.java
@@ -7,14 +7,15 @@
 
 package net.java.sip.communicator.impl.protocol.jabber.extensions.whiteboard;
 
-import net.java.sip.communicator.util.*;
 import java.io.*;
+
 import javax.xml.parsers.*;
-import net.java.sip.communicator.util.Base64;
-import org.w3c.dom.*;
 
-import net.java.sip.communicator.service.protocol.WhiteboardPoint;
+import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.whiteboardobjects.*;
+import net.java.sip.communicator.util.*;
+
+import org.w3c.dom.*;
 
 /**
  *  WhiteboardObjectImageJabberImpl
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectJabberImpl.java
index 1e32aa6..8470553 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectJabberImpl.java
@@ -8,9 +8,9 @@
 package net.java.sip.communicator.impl.protocol.jabber.extensions.whiteboard;
 
 
-import java.awt.Color;
+import java.awt.*;
 
-import net.java.sip.communicator.service.protocol.whiteboardobjects.WhiteboardObject;
+import net.java.sip.communicator.service.protocol.whiteboardobjects.*;
 
 /**
  * WhiteboardObjectJabberImpl
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectJabberProvider.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectJabberProvider.java
index 1a58bf9..ea1d202 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectJabberProvider.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectJabberProvider.java
@@ -7,9 +7,9 @@
 
 package net.java.sip.communicator.impl.protocol.jabber.extensions.whiteboard;
 
-import org.jivesoftware.smack.packet.PacketExtension;
-import org.jivesoftware.smack.provider.PacketExtensionProvider;
-import org.xmlpull.v1.XmlPullParser;
+import org.jivesoftware.smack.packet.*;
+import org.jivesoftware.smack.provider.*;
+import org.xmlpull.v1.*;
 
 /**
  * This class parses incoming messages and extracts the whiteboard parameters
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectLineJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectLineJabberImpl.java
index e9baf03..6318c56 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectLineJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectLineJabberImpl.java
@@ -7,14 +7,16 @@
 
 package net.java.sip.communicator.impl.protocol.jabber.extensions.whiteboard;
 
-import net.java.sip.communicator.util.*;
-import java.awt.Color;
+import java.awt.*;
 import java.io.*;
+
 import javax.xml.parsers.*;
-import org.w3c.dom.*;
 
-import net.java.sip.communicator.service.protocol.WhiteboardPoint;
+import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.whiteboardobjects.*;
+import net.java.sip.communicator.util.*;
+
+import org.w3c.dom.*;
 
 /**
  *  WhiteboardObjectLineJabberImpl
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectRectJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectRectJabberImpl.java
index 65e3b38..f4b4061 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectRectJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectRectJabberImpl.java
@@ -7,14 +7,16 @@
 
 package net.java.sip.communicator.impl.protocol.jabber.extensions.whiteboard;
 
-import net.java.sip.communicator.util.*;
-import java.awt.Color;
+import java.awt.*;
 import java.io.*;
+
 import javax.xml.parsers.*;
-import org.w3c.dom.*;
 
-import net.java.sip.communicator.service.protocol.WhiteboardPoint;
+import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.whiteboardobjects.*;
+import net.java.sip.communicator.util.*;
+
+import org.w3c.dom.*;
 
 /**
  *  WhiteboardObjectRectJabberImpl
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectTextJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectTextJabberImpl.java
index ea9e730..7bcb828 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectTextJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectTextJabberImpl.java
@@ -7,14 +7,16 @@
 
 package net.java.sip.communicator.impl.protocol.jabber.extensions.whiteboard;
 
-import net.java.sip.communicator.util.*;
 import java.awt.*;
 import java.io.*;
+
 import javax.xml.parsers.*;
-import org.w3c.dom.*;
 
-import net.java.sip.communicator.service.protocol.WhiteboardPoint;
+import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.whiteboardobjects.*;
+import net.java.sip.communicator.util.*;
+
+import org.w3c.dom.*;
 
 /**
  *  WhiteboardObjectTextJabberImpl
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/sasl/SASLDigestMD5Mechanism.java b/src/net/java/sip/communicator/impl/protocol/jabber/sasl/SASLDigestMD5Mechanism.java
index dccc9e7..552d797 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/sasl/SASLDigestMD5Mechanism.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/sasl/SASLDigestMD5Mechanism.java
@@ -8,6 +8,7 @@ package net.java.sip.communicator.impl.protocol.jabber.sasl;
 
 import java.io.*;
 import java.util.*;
+
 import javax.security.auth.callback.*;
 import javax.security.sasl.*;
 
diff --git a/src/net/java/sip/communicator/impl/protocol/mock/MockChatRoom.java b/src/net/java/sip/communicator/impl/protocol/mock/MockChatRoom.java
index 2e0383c..61360fc 100644
--- a/src/net/java/sip/communicator/impl/protocol/mock/MockChatRoom.java
+++ b/src/net/java/sip/communicator/impl/protocol/mock/MockChatRoom.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.impl.protocol.mock;
 
 import java.util.*;
+
 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/mock/MockFileTransferImpl.java b/src/net/java/sip/communicator/impl/protocol/mock/MockFileTransferImpl.java
index 9b01fdd..4721e9b 100644
--- a/src/net/java/sip/communicator/impl/protocol/mock/MockFileTransferImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/mock/MockFileTransferImpl.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.impl.protocol.mock;
 
 import java.io.*;
+
 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/msn/ContactMsnImpl.java b/src/net/java/sip/communicator/impl/protocol/msn/ContactMsnImpl.java
index a978436..d947a5f 100644
--- a/src/net/java/sip/communicator/impl/protocol/msn/ContactMsnImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/msn/ContactMsnImpl.java
@@ -8,7 +8,7 @@ package net.java.sip.communicator.impl.protocol.msn;
 
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.msnconstants.*;
-import net.sf.jml.MsnContact;
+import net.sf.jml.*;
 
 /**
  * The Msn implementation of the service.protocol.Contact interface.
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 b50ea8c..b928268 100644
--- a/src/net/java/sip/communicator/impl/protocol/msn/EventManager.java
+++ b/src/net/java/sip/communicator/impl/protocol/msn/EventManager.java
@@ -8,9 +8,9 @@ package net.java.sip.communicator.impl.protocol.msn;
 
 import java.util.*;
 
-import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
+import net.java.sip.communicator.util.*;
 import net.sf.jml.*;
 import net.sf.jml.impl.*;
 import net.sf.jml.net.*;
diff --git a/src/net/java/sip/communicator/impl/protocol/msn/IncomingFileTransferRequestMsnImpl.java b/src/net/java/sip/communicator/impl/protocol/msn/IncomingFileTransferRequestMsnImpl.java
index fe148f3..b6744f1 100644
--- a/src/net/java/sip/communicator/impl/protocol/msn/IncomingFileTransferRequestMsnImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/msn/IncomingFileTransferRequestMsnImpl.java
@@ -6,7 +6,7 @@
  */
 package net.java.sip.communicator.impl.protocol.msn;
 
-import java.io.File;
+import java.io.*;
 import java.util.*;
 
 import net.java.sip.communicator.service.protocol.*;
diff --git a/src/net/java/sip/communicator/impl/protocol/msn/OperationSetBasicInstantMessagingMsnImpl.java b/src/net/java/sip/communicator/impl/protocol/msn/OperationSetBasicInstantMessagingMsnImpl.java
index 178a475..b137682 100644
--- a/src/net/java/sip/communicator/impl/protocol/msn/OperationSetBasicInstantMessagingMsnImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/msn/OperationSetBasicInstantMessagingMsnImpl.java
@@ -9,13 +9,13 @@ package net.java.sip.communicator.impl.protocol.msn;
 import java.text.*;
 import java.util.*;
 
+import net.java.sip.communicator.impl.protocol.msn.mail.utils.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 import net.sf.jml.*;
 import net.sf.jml.event.*;
 import net.sf.jml.message.*;
-import net.java.sip.communicator.impl.protocol.msn.mail.utils.*;
 
 /**
  * A straightforward implementation of the basic instant messaging operation
diff --git a/src/net/java/sip/communicator/impl/protocol/msn/OperationSetServerStoredAccountInfoMsnImpl.java b/src/net/java/sip/communicator/impl/protocol/msn/OperationSetServerStoredAccountInfoMsnImpl.java
index 14f6608..421c2c1 100644
--- a/src/net/java/sip/communicator/impl/protocol/msn/OperationSetServerStoredAccountInfoMsnImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/msn/OperationSetServerStoredAccountInfoMsnImpl.java
@@ -8,14 +8,16 @@ package net.java.sip.communicator.impl.protocol.msn;
 
 import java.io.*;
 import java.util.*;
+
+import javax.imageio.*;
+
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.protocol.ServerStoredDetails.*;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.GenericDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.ImageDetail;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 import net.sf.jml.*;
 
-import javax.imageio.*;
-
 /**
  * Saves account avatar image. If one is already saved we set it as initial one
  * for the MsnOwner.
diff --git a/src/net/java/sip/communicator/impl/protocol/msn/ProtocolProviderFactoryMsnImpl.java b/src/net/java/sip/communicator/impl/protocol/msn/ProtocolProviderFactoryMsnImpl.java
index 3ede884..cb94ba6 100644
--- a/src/net/java/sip/communicator/impl/protocol/msn/ProtocolProviderFactoryMsnImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/msn/ProtocolProviderFactoryMsnImpl.java
@@ -8,10 +8,10 @@ package net.java.sip.communicator.impl.protocol.msn;
 
 import java.util.*;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.protocol.*;
 
+import org.osgi.framework.*;
+
 /**
  * The Msn implementation of the ProtocolProviderFactory.
  * @author Damian Minkov
diff --git a/src/net/java/sip/communicator/impl/protocol/msn/mail/utils/MimeUtility.java b/src/net/java/sip/communicator/impl/protocol/msn/mail/utils/MimeUtility.java
index 493e3c2..a21b7cf 100644
--- a/src/net/java/sip/communicator/impl/protocol/msn/mail/utils/MimeUtility.java
+++ b/src/net/java/sip/communicator/impl/protocol/msn/mail/utils/MimeUtility.java
@@ -27,11 +27,8 @@
 
 package net.java.sip.communicator.impl.protocol.msn.mail.utils;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.util.StringTokenizer;
+import java.io.*;
+import java.util.*;
 
 /**
  * This is a utility class providing micellaneous MIME-related functionality.
diff --git a/src/net/java/sip/communicator/impl/protocol/rss/ImageRetriever.java b/src/net/java/sip/communicator/impl/protocol/rss/ImageRetriever.java
index ba9b1e9..adb3418 100644
--- a/src/net/java/sip/communicator/impl/protocol/rss/ImageRetriever.java
+++ b/src/net/java/sip/communicator/impl/protocol/rss/ImageRetriever.java
@@ -14,11 +14,11 @@ import java.util.*;
 
 import javax.imageio.*;
 
-import com.ctreber.aclib.image.ico.*;
-
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 
+import com.ctreber.aclib.image.ico.*;
+
 /**
  * A class that implements threaded retrieval for rss images. We launch from
  * within the presence operation set in order to retrieve image icons without
diff --git a/src/net/java/sip/communicator/impl/protocol/rss/OperationSetBasicInstantMessagingRssImpl.java b/src/net/java/sip/communicator/impl/protocol/rss/OperationSetBasicInstantMessagingRssImpl.java
index 7487243..dedcef5 100644
--- a/src/net/java/sip/communicator/impl/protocol/rss/OperationSetBasicInstantMessagingRssImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/rss/OperationSetBasicInstantMessagingRssImpl.java
@@ -8,10 +8,10 @@ package net.java.sip.communicator.impl.protocol.rss;
 
 import java.io.*;
 import java.util.*;
+
 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/rss/ProtocolProviderFactoryRssImpl.java b/src/net/java/sip/communicator/impl/protocol/rss/ProtocolProviderFactoryRssImpl.java
index c3bf843..e355fb6 100644
--- a/src/net/java/sip/communicator/impl/protocol/rss/ProtocolProviderFactoryRssImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/rss/ProtocolProviderFactoryRssImpl.java
@@ -12,11 +12,11 @@ import java.util.*;
 
 import javax.net.ssl.*;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * The Rss protocol provider factory creates instances of the Rss
  * protocol provider service. One Service instance corresponds to one account.
diff --git a/src/net/java/sip/communicator/impl/protocol/rss/RssAccountID.java b/src/net/java/sip/communicator/impl/protocol/rss/RssAccountID.java
index 20f847f..3709681 100644
--- a/src/net/java/sip/communicator/impl/protocol/rss/RssAccountID.java
+++ b/src/net/java/sip/communicator/impl/protocol/rss/RssAccountID.java
@@ -6,9 +6,10 @@
  */
 package net.java.sip.communicator.impl.protocol.rss;
 
-import net.java.sip.communicator.service.protocol.*;
 import java.util.*;
 
+import net.java.sip.communicator.service.protocol.*;
+
 /**
  * The Rss implementation of a sip-communicator account id.
  * @author Emil Ivov
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 23af3ed..11a4707 100644
--- a/src/net/java/sip/communicator/impl/protocol/rss/RssFeedReader.java
+++ b/src/net/java/sip/communicator/impl/protocol/rss/RssFeedReader.java
@@ -10,12 +10,12 @@ import java.io.*;
 import java.net.*;
 import java.util.*;
 
-import com.sun.syndication.feed.synd.*;
-import com.sun.syndication.io.*;
-
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
+import com.sun.syndication.feed.synd.*;
+import com.sun.syndication.io.*;
+
 /**
  * Wrapper class for the ROME functionality used in the RSS implementation in
  * SIP Communicator.
diff --git a/src/net/java/sip/communicator/impl/protocol/rss/RssItemKey.java b/src/net/java/sip/communicator/impl/protocol/rss/RssItemKey.java
index 219c060..aea29ee 100644
--- a/src/net/java/sip/communicator/impl/protocol/rss/RssItemKey.java
+++ b/src/net/java/sip/communicator/impl/protocol/rss/RssItemKey.java
@@ -6,12 +6,12 @@
  */

 package net.java.sip.communicator.impl.protocol.rss;

 

-import com.sun.syndication.feed.synd.*;

+import java.text.*;

+import java.util.*;

 

 import net.java.sip.communicator.util.*;

 

-import java.text.*;

-import java.util.*;

+import com.sun.syndication.feed.synd.*;

 

 /**

  * The <code>RssItemKey</code> is used to encapsulate information pertaining to

diff --git a/src/net/java/sip/communicator/impl/protocol/rss/RssStatusEnum.java b/src/net/java/sip/communicator/impl/protocol/rss/RssStatusEnum.java
index fa856b4..5b9ebf2 100644
--- a/src/net/java/sip/communicator/impl/protocol/rss/RssStatusEnum.java
+++ b/src/net/java/sip/communicator/impl/protocol/rss/RssStatusEnum.java
@@ -6,11 +6,11 @@
  */
 package net.java.sip.communicator.impl.protocol.rss;
 
+import java.io.*;
 import java.util.*;
 
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
-import java.io.*;
 
 /**
  * An implementation of <tt>PresenceStatus</tt> that enumerates all states that
diff --git a/src/net/java/sip/communicator/impl/protocol/rss/RssTimerRefreshFeed.java b/src/net/java/sip/communicator/impl/protocol/rss/RssTimerRefreshFeed.java
index ad9dcfe..13eb074 100644
--- a/src/net/java/sip/communicator/impl/protocol/rss/RssTimerRefreshFeed.java
+++ b/src/net/java/sip/communicator/impl/protocol/rss/RssTimerRefreshFeed.java
@@ -6,7 +6,8 @@
  */
 package net.java.sip.communicator.impl.protocol.rss;
 
-import java.util.TimerTask;
+import java.util.*;
+
 import net.java.sip.communicator.util.*;
 
 /**
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 b0d9ae1..7f73dd9 100644
--- a/src/net/java/sip/communicator/impl/protocol/rss/UriHandlerRssImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/rss/UriHandlerRssImpl.java
@@ -8,13 +8,13 @@ package net.java.sip.communicator.impl.protocol.rss;
 
 import java.util.*;
 
-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.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * The RSS implementation of the URI handler. This class handles RSS feeds by
  * adding them to your contact list.
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/AddressResolverImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/AddressResolverImpl.java
index bab0800..486b2cc 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/AddressResolverImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/AddressResolverImpl.java
@@ -6,14 +6,14 @@
  */
 package net.java.sip.communicator.impl.protocol.sip;
 
+import gov.nist.core.net.*;
+import gov.nist.javax.sip.stack.*;
+
 import java.net.*;
 
 import javax.sip.*;
 import javax.sip.address.*;
 
-import gov.nist.core.net.*;
-import gov.nist.javax.sip.stack.*;
-
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/ContactGroupSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/ContactGroupSipImpl.java
index b0fcced..d722cbc 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/ContactGroupSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/ContactGroupSipImpl.java
@@ -6,12 +6,14 @@
  */
 package net.java.sip.communicator.impl.protocol.sip;
 
+import java.util.*;
+
+import javax.xml.namespace.*;
+
 import net.java.sip.communicator.impl.protocol.sip.xcap.model.resourcelists.*;
 import net.java.sip.communicator.service.protocol.*;
 
 import org.w3c.dom.*;
-import javax.xml.namespace.*;
-import java.util.*;
 
 /**
  * A simple, straightforward implementation of a SIP ContactGroup. Since
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/ContactSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/ContactSipImpl.java
index 8c3e7fd..23053e3 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/ContactSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/ContactSipImpl.java
@@ -6,14 +6,16 @@
  */
 package net.java.sip.communicator.impl.protocol.sip;
 
+import java.net.URI;
+import java.util.*;
+
+import javax.sip.address.*;
+import javax.xml.namespace.*;
+
 import net.java.sip.communicator.impl.protocol.sip.xcap.model.resourcelists.*;
 import net.java.sip.communicator.service.protocol.*;
 
 import org.w3c.dom.*;
-import javax.sip.address.*;
-import javax.xml.namespace.*;
-import java.net.URI;
-import java.util.*;
 
 /**
  * A simple, straightforward implementation of a SIP Contact.
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/DesktopSharingProtocolSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/DesktopSharingProtocolSipImpl.java
index 8076f9d..39baa26 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/DesktopSharingProtocolSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/DesktopSharingProtocolSipImpl.java
@@ -6,12 +6,13 @@
  */
 package net.java.sip.communicator.impl.protocol.sip;
 
-import java.util.*;
-import java.util.List; // disambiguation
 import java.awt.*;
 import java.awt.event.*;
+import java.util.*;
+import java.util.List;
 
 import org.w3c.dom.*;
+// disambiguation
 
 /**
  * Utility class to provide XML definition for the desktop sharing SIP
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/EventPackageUtils.java b/src/net/java/sip/communicator/impl/protocol/sip/EventPackageUtils.java
index deb3f41..fda8765 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/EventPackageUtils.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/EventPackageUtils.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.impl.protocol.sip;
 
 import java.util.*;
+
 import javax.sip.*;
 
 /**
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 7c73fa4..80ed0b8 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java
@@ -6,7 +6,7 @@
  */
 package net.java.sip.communicator.impl.protocol.sip;
 
-import gov.nist.javax.sip.header.HeaderFactoryImpl; // disambiguates Contact
+import gov.nist.javax.sip.header.*;
 import gov.nist.javax.sip.header.extensions.*;
 
 import java.net.*;
@@ -19,9 +19,11 @@ import javax.sip.header.*;
 import javax.sip.message.*;
 
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.service.protocol.Contact;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.service.protocol.media.*;
 import net.java.sip.communicator.util.*;
+// disambiguates Contact
 
 /**
  * Implements all call management logic and exports basic telephony support by
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetDesktopSharingClientSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetDesktopSharingClientSipImpl.java
index b1c1050..13dba88 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetDesktopSharingClientSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetDesktopSharingClientSipImpl.java
@@ -6,21 +6,23 @@
  */
 package net.java.sip.communicator.impl.protocol.sip;
 
+import java.awt.*;
+import java.awt.event.*;
 import java.io.*;
 import java.text.*;
 import java.util.*;
-import java.awt.*;
-import java.awt.event.*;
+import java.util.Queue;
 
 import javax.sip.*;
+import javax.sip.Dialog;
 import javax.sip.address.*;
 import javax.sip.header.*;
 import javax.sip.message.*;
-import javax.sip.Dialog; // disambiguation
 
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
+// disambiguation
 
 /**
  * Implements all desktop sharing client-side related functions for SIP
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 ec2cb72..8fd905c 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetPresenceSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetPresenceSipImpl.java
@@ -6,19 +6,19 @@
  */
 package net.java.sip.communicator.impl.protocol.sip;
 
-import java.net.*;
+import java.net.URI;
 import java.text.*;
 import java.util.*;
 
 import javax.sip.*;
-import javax.sip.address.Address;
+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.*;
 import net.java.sip.communicator.util.*;
-import net.java.sip.communicator.util.xml.*;
+import net.java.sip.communicator.util.xml.XMLUtils;
 
 import org.w3c.dom.*;
 
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetServerStoredAccountInfoSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetServerStoredAccountInfoSipImpl.java
index d574c1e..4ad22a7 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetServerStoredAccountInfoSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetServerStoredAccountInfoSipImpl.java
@@ -6,13 +6,15 @@
  */
 package net.java.sip.communicator.impl.protocol.sip;
 
+import java.util.*;
+
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.protocol.ServerStoredDetails.*;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.DisplayNameDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.GenericDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.ImageDetail;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 
-import java.util.*;
-
 /**
  * SIP server stored account information. Supports the user avatar during
  * pres-content specification.
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetTypingNotificationsSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetTypingNotificationsSipImpl.java
index 5735416..30dfa9e 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetTypingNotificationsSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetTypingNotificationsSipImpl.java
@@ -17,7 +17,7 @@ import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.Message;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
-import net.java.sip.communicator.util.xml.*;
+import net.java.sip.communicator.util.xml.XMLUtils;
 
 import org.w3c.dom.*;
 
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderFactorySipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderFactorySipImpl.java
index ff5d1df..bc4ac21 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderFactorySipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderFactorySipImpl.java
@@ -8,8 +8,8 @@ package net.java.sip.communicator.impl.protocol.sip;
 
 import java.util.*;
 
-import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.credentialsstorage.*;
+import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
 import org.osgi.framework.*;
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/ServerStoredContactList.java b/src/net/java/sip/communicator/impl/protocol/sip/ServerStoredContactList.java
index 1226f01..6299934 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/ServerStoredContactList.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/ServerStoredContactList.java
@@ -6,16 +6,17 @@
  */
 package net.java.sip.communicator.impl.protocol.sip;
 
+import java.net.URI;
+import java.text.*;
+import java.util.*;
+
+import javax.sip.address.*;
+
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.ServerStoredDetails.ImageDetail;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 
-import javax.sip.address.*;
-import java.net.URI;
-import java.text.*;
-import java.util.*;
-
 /**
  * The parent server stored contact list used in
  * <tt>OperationSetPresenceSipImpl</tt> the underling implementation
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/ServerStoredContactListSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/ServerStoredContactListSipImpl.java
index 404307a..e4aedaa 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/ServerStoredContactListSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/ServerStoredContactListSipImpl.java
@@ -7,6 +7,13 @@
 package net.java.sip.communicator.impl.protocol.sip;
 
 import gov.nist.javax.sip.address.*;
+
+import java.net.URI;
+import java.text.*;
+import java.util.*;
+
+import javax.sip.address.*;
+
 import net.java.sip.communicator.impl.protocol.sip.xcap.*;
 import net.java.sip.communicator.impl.protocol.sip.xcap.model.commonpolicy.*;
 import net.java.sip.communicator.impl.protocol.sip.xcap.model.prescontent.*;
@@ -16,13 +23,9 @@ import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.ServerStoredDetails.ImageDetail;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
-import net.java.sip.communicator.util.xml.*;
-import org.w3c.dom.*;
+import net.java.sip.communicator.util.xml.XMLUtils;
 
-import javax.sip.address.*;
-import java.net.URI;
-import java.text.*;
-import java.util.*;
+import org.w3c.dom.*;
 
 /**
  * Encapsulates XCapClient, it's responsible for generate corresponding
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/SipApplicationData.java b/src/net/java/sip/communicator/impl/protocol/sip/SipApplicationData.java
index 305117d..27e48ad 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/SipApplicationData.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/SipApplicationData.java
@@ -7,7 +7,9 @@
 package net.java.sip.communicator.impl.protocol.sip;
 
 import gov.nist.javax.sip.message.*;
+
 import java.util.*;
+
 import javax.sip.*;
 
 import net.java.sip.communicator.util.*;
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/SipRegistrarConnection.java b/src/net/java/sip/communicator/impl/protocol/sip/SipRegistrarConnection.java
index 548199c..e8271ad 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/SipRegistrarConnection.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/SipRegistrarConnection.java
@@ -6,6 +6,8 @@
  */
 package net.java.sip.communicator.impl.protocol.sip;
 
+import gov.nist.javax.sip.message.*;
+
 import java.io.*;
 import java.net.*;
 import java.security.cert.*;
@@ -18,7 +20,6 @@ import javax.sip.address.*;
 import javax.sip.header.*;
 import javax.sip.message.*;
 
-import gov.nist.javax.sip.message.*;
 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/UriHandlerSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/UriHandlerSipImpl.java
index 0edd445..55f9380 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/UriHandlerSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/UriHandlerSipImpl.java
@@ -8,14 +8,14 @@ package net.java.sip.communicator.impl.protocol.sip;
 import java.text.*;
 import java.util.*;
 
-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.*;
 
+import org.osgi.framework.*;
+
 /**
  * The sip implementation of the URI handler. This class handles sip URIs by
  * trying to establish a call to them.
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/net/AutoProxyConnection.java b/src/net/java/sip/communicator/impl/protocol/sip/net/AutoProxyConnection.java
index 4846bb8..32c0e19 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/net/AutoProxyConnection.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/net/AutoProxyConnection.java
@@ -6,7 +6,11 @@
  */

 package net.java.sip.communicator.impl.protocol.sip.net;

 

-import static net.java.sip.communicator.service.protocol.ProtocolProviderFactory.*;

+import static javax.sip.ListeningPoint.TCP;

+import static javax.sip.ListeningPoint.TLS;

+import static javax.sip.ListeningPoint.UDP;

+import static net.java.sip.communicator.service.protocol.ProtocolProviderFactory.SERVER_ADDRESS;

+import static net.java.sip.communicator.service.protocol.ProtocolProviderFactory.USER_ID;

 

 import java.net.*;

 import java.text.*;

@@ -16,7 +20,6 @@ import javax.sip.*;
 import net.java.sip.communicator.impl.protocol.sip.*;

 import net.java.sip.communicator.util.*;

 import net.java.sip.communicator.util.dns.*;

-import static javax.sip.ListeningPoint.*;

 

 /**

  * Implementation of the autodetect proxy connection. Tries to resolve a SIP-

diff --git a/src/net/java/sip/communicator/impl/protocol/sip/net/ManualProxyConnection.java b/src/net/java/sip/communicator/impl/protocol/sip/net/ManualProxyConnection.java
index 83db84e..f9beb00 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/net/ManualProxyConnection.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/net/ManualProxyConnection.java
@@ -6,8 +6,10 @@
  */

 package net.java.sip.communicator.impl.protocol.sip.net;

 

-import static javax.sip.ListeningPoint.*;

-import static net.java.sip.communicator.service.protocol.ProtocolProviderFactory.*;

+import static javax.sip.ListeningPoint.PORT_5060;

+import static net.java.sip.communicator.service.protocol.ProtocolProviderFactory.PREFERRED_TRANSPORT;

+import static net.java.sip.communicator.service.protocol.ProtocolProviderFactory.PROXY_ADDRESS;

+import static net.java.sip.communicator.service.protocol.ProtocolProviderFactory.PROXY_PORT;

 

 import java.net.*;

 import java.text.*;

diff --git a/src/net/java/sip/communicator/impl/protocol/sip/net/ProxyConnection.java b/src/net/java/sip/communicator/impl/protocol/sip/net/ProxyConnection.java
index 84d91f3..bd80212 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/net/ProxyConnection.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/net/ProxyConnection.java
@@ -1,11 +1,12 @@
 package net.java.sip.communicator.impl.protocol.sip.net;

 

+import static net.java.sip.communicator.service.protocol.ProtocolProviderFactory.PROXY_AUTO_CONFIG;

+

 import java.net.*;

 import java.util.*;

 

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

-import net.java.sip.communicator.util.dns.DnssecException;

-import static net.java.sip.communicator.service.protocol.ProtocolProviderFactory.*;

+import net.java.sip.communicator.util.dns.*;

 

 /**

  * Abstract class for the determining the address for the SIP proxy.

diff --git a/src/net/java/sip/communicator/impl/protocol/sip/net/SslNetworkLayer.java b/src/net/java/sip/communicator/impl/protocol/sip/net/SslNetworkLayer.java
index f4700cd..af3819b 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/net/SslNetworkLayer.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/net/SslNetworkLayer.java
@@ -6,6 +6,8 @@
  */
 package net.java.sip.communicator.impl.protocol.sip.net;
 
+import gov.nist.core.net.*;
+
 import java.io.*;
 import java.net.*;
 import java.security.*;
@@ -13,14 +15,12 @@ import java.util.*;
 
 import javax.net.ssl.*;
 
-import gov.nist.core.net.*;
-
 import net.java.sip.communicator.impl.protocol.sip.*;
 import net.java.sip.communicator.service.certificate.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.util.Logger;
+import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.osgi.framework.*;
 
 /**
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 74f08e3..2c687e0 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
@@ -7,7 +7,7 @@
 package net.java.sip.communicator.impl.protocol.sip.security;
 
 import java.util.*;
-import java.util.Map.*;
+import java.util.Map.Entry;
 
 import javax.sip.header.*;
 
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 801f6bf..353ea1c 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,7 +6,7 @@
  */
 package net.java.sip.communicator.impl.protocol.sip.security;
 
-import java.util.Vector;
+import java.util.*;
 
 import net.java.sip.communicator.service.protocol.*;
 
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/security/MessageDigestAlgorithm.java b/src/net/java/sip/communicator/impl/protocol/sip/security/MessageDigestAlgorithm.java
index b42c161..d7648f1 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/security/MessageDigestAlgorithm.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/security/MessageDigestAlgorithm.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.impl.protocol.sip.security;
 
 import java.security.*;
+
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/BaseHttpXCapClient.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/BaseHttpXCapClient.java
index 060d4e0..96e9f1a 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/BaseHttpXCapClient.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/BaseHttpXCapClient.java
@@ -6,13 +6,21 @@
  */
 package net.java.sip.communicator.impl.protocol.sip.xcap;
 
+import java.io.*;
+import java.net.*;
+import java.net.URI;
+
+import javax.net.ssl.*;
+import javax.sip.address.*;
+
 import net.java.sip.communicator.impl.protocol.sip.*;
-import net.java.sip.communicator.impl.protocol.sip.xcap.utils.*;
 import net.java.sip.communicator.impl.protocol.sip.xcap.model.*;
 import net.java.sip.communicator.impl.protocol.sip.xcap.model.xcaperror.*;
+import net.java.sip.communicator.impl.protocol.sip.xcap.utils.*;
 import net.java.sip.communicator.service.certificate.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.util.*;
+
 import org.apache.http.*;
 import org.apache.http.auth.*;
 import org.apache.http.client.methods.*;
@@ -24,12 +32,6 @@ import org.apache.http.impl.client.*;
 import org.apache.http.params.*;
 import org.osgi.framework.*;
 
-import javax.net.ssl.*;
-import javax.sip.address.*;
-import java.io.*;
-import java.net.URI;
-import java.net.*;
-
 /**
  * Base HTTP XCAP client implementation.
  * <p/>
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/HttpXCapClient.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/HttpXCapClient.java
index bc68b4a..1c4d4ce 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/HttpXCapClient.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/HttpXCapClient.java
@@ -6,9 +6,10 @@
  */
 package net.java.sip.communicator.impl.protocol.sip.xcap;
 
-import javax.sip.address.*;
 import java.net.URI;
 
+import javax.sip.address.*;
+
 /**
  * HTTP XCAP client interface.
  * <p/>
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/PresContentClient.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/PresContentClient.java
index 0ad57cf..7567273 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/PresContentClient.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/PresContentClient.java
@@ -6,10 +6,10 @@
  */
 package net.java.sip.communicator.impl.protocol.sip.xcap;
 
-import net.java.sip.communicator.impl.protocol.sip.xcap.model.prescontent.*;
-
 import java.net.*;
 
+import net.java.sip.communicator.impl.protocol.sip.xcap.model.prescontent.*;
+
 /**
  * XCAP pres-content client interface.
  * <p/>
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/XCapClientImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/XCapClientImpl.java
index c31e8f9..d3a6b4f 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/XCapClientImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/XCapClientImpl.java
@@ -6,6 +6,11 @@
  */
 package net.java.sip.communicator.impl.protocol.sip.xcap;
 
+import java.io.*;
+import java.net.URI;
+
+import javax.sip.address.*;
+
 import net.java.sip.communicator.impl.protocol.sip.*;
 import net.java.sip.communicator.impl.protocol.sip.xcap.model.*;
 import net.java.sip.communicator.impl.protocol.sip.xcap.model.commonpolicy.*;
@@ -13,11 +18,8 @@ import net.java.sip.communicator.impl.protocol.sip.xcap.model.prescontent.*;
 import net.java.sip.communicator.impl.protocol.sip.xcap.model.resourcelists.*;
 import net.java.sip.communicator.impl.protocol.sip.xcap.model.xcapcaps.*;
 import net.java.sip.communicator.util.*;
-import org.apache.http.*;
 
-import javax.sip.address.*;
-import java.io.*;
-import java.net.URI;
+import org.apache.http.*;
 
 /**
  * XCAP client implementation.
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/XmlUtils.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/XmlUtils.java
index ad8408d..04e1456 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/XmlUtils.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/XmlUtils.java
@@ -6,11 +6,12 @@
  */
 package net.java.sip.communicator.impl.protocol.sip.xcap.model;
 
-import org.w3c.dom.*;
-
 import java.util.*;
+
 import javax.xml.namespace.*;
 
+import org.w3c.dom.*;
+
 /**
  * Utility class that helps to convert classes into xml and from xml to the
  * classes.
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/commonpolicy/ActionsType.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/commonpolicy/ActionsType.java
index dc1b7cb..e76cb05 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/commonpolicy/ActionsType.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/commonpolicy/ActionsType.java
@@ -6,10 +6,10 @@
  */
 package net.java.sip.communicator.impl.protocol.sip.xcap.model.commonpolicy;
 
-import net.java.sip.communicator.impl.protocol.sip.xcap.model.presrules.*;
-
 import java.util.*;
 
+import net.java.sip.communicator.impl.protocol.sip.xcap.model.presrules.*;
+
 import org.w3c.dom.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/commonpolicy/CommonPolicyParser.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/commonpolicy/CommonPolicyParser.java
index 1cd10d5..4995f04 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/commonpolicy/CommonPolicyParser.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/commonpolicy/CommonPolicyParser.java
@@ -6,14 +6,19 @@
  */
 package net.java.sip.communicator.impl.protocol.sip.xcap.model.commonpolicy;
 
-import static net.java.sip.communicator.util.StringUtils.*;
-import static net.java.sip.communicator.util.xml.XMLUtils.*;
-import static net.java.sip.communicator.impl.protocol.sip.xcap.model.XmlUtils.*;
+import static net.java.sip.communicator.impl.protocol.sip.xcap.model.XmlUtils.processAny;
+import static net.java.sip.communicator.util.StringUtils.isNullOrEmpty;
+import static net.java.sip.communicator.util.xml.XMLUtils.createDocument;
+import static net.java.sip.communicator.util.xml.XMLUtils.createXml;
+import static net.java.sip.communicator.util.xml.XMLUtils.getNamespaceUri;
+import static net.java.sip.communicator.util.xml.XMLUtils.isStandartXmlNamespace;
+
+import java.util.*;
+
 import net.java.sip.communicator.impl.protocol.sip.xcap.model.*;
 import net.java.sip.communicator.impl.protocol.sip.xcap.model.presrules.*;
-import org.w3c.dom.*;
 
-import java.util.*;
+import org.w3c.dom.*;
 
 /**
  * Utility class that helps to converts common-policy xml to the object model
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/commonpolicy/ConditionsType.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/commonpolicy/ConditionsType.java
index cd5c842..7721dd4 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/commonpolicy/ConditionsType.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/commonpolicy/ConditionsType.java
@@ -6,10 +6,10 @@
  */
 package net.java.sip.communicator.impl.protocol.sip.xcap.model.commonpolicy;
 
-import org.w3c.dom.*;
-
 import java.util.*;
 
+import org.w3c.dom.*;
+
 /**
  * The Authorization Rules conditions element.
  * <p/>
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/commonpolicy/IdentityType.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/commonpolicy/IdentityType.java
index d45d13f..fc93a76 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/commonpolicy/IdentityType.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/commonpolicy/IdentityType.java
@@ -6,10 +6,10 @@
  */
 package net.java.sip.communicator.impl.protocol.sip.xcap.model.commonpolicy;
 
-import org.w3c.dom.*;
-
 import java.util.*;
 
+import org.w3c.dom.*;
+
 /**
  * The Authorization Rules identity element.
  * <p/>
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/commonpolicy/ManyType.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/commonpolicy/ManyType.java
index 26b656c..e3eaf7a 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/commonpolicy/ManyType.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/commonpolicy/ManyType.java
@@ -6,10 +6,10 @@
  */
 package net.java.sip.communicator.impl.protocol.sip.xcap.model.commonpolicy;
 
-import org.w3c.dom.*;
-
 import java.util.*;
 
+import org.w3c.dom.*;
+
 /**
  * The Authorization Rules many element.
  * <p/>
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/commonpolicy/OneType.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/commonpolicy/OneType.java
index 6e17029..7d48b7c 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/commonpolicy/OneType.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/commonpolicy/OneType.java
@@ -6,8 +6,9 @@
  */
 package net.java.sip.communicator.impl.protocol.sip.xcap.model.commonpolicy;
 
+import net.java.sip.communicator.util.*;
+
 import org.w3c.dom.*;
-import net.java.sip.communicator.util.*;      
 
 /**
  * The Authorization Rules one element.
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/commonpolicy/TransformationsType.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/commonpolicy/TransformationsType.java
index 3cf7d4d..1391e57 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/commonpolicy/TransformationsType.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/commonpolicy/TransformationsType.java
@@ -6,10 +6,11 @@
  */
 package net.java.sip.communicator.impl.protocol.sip.xcap.model.commonpolicy;
 
+import java.util.*;
+
 import net.java.sip.communicator.impl.protocol.sip.xcap.model.presrules.*;
-import org.w3c.dom.*;
 
-import java.util.*;
+import org.w3c.dom.*;
 
 /**
  * The Authorization Rules transformations element.
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/prescontent/ContentType.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/prescontent/ContentType.java
index 145d88b..62cbde0 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/prescontent/ContentType.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/prescontent/ContentType.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.impl.protocol.sip.xcap.model.prescontent;
 
 import java.util.*;
+
 import javax.xml.namespace.*;
 
 import org.w3c.dom.*;
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/prescontent/DataType.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/prescontent/DataType.java
index 6c29824..fa9d59e 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/prescontent/DataType.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/prescontent/DataType.java
@@ -6,9 +6,10 @@
  */
 package net.java.sip.communicator.impl.protocol.sip.xcap.model.prescontent;
 
-import javax.xml.namespace.*;
 import java.util.*;
 
+import javax.xml.namespace.*;
+
 /**
  * The PRES-CONTENT data element.
  * <p/>
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/prescontent/DescriptionType.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/prescontent/DescriptionType.java
index 98c1d08..6b11404 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/prescontent/DescriptionType.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/prescontent/DescriptionType.java
@@ -6,9 +6,10 @@
  */
 package net.java.sip.communicator.impl.protocol.sip.xcap.model.prescontent;
 
-import javax.xml.namespace.*;
 import java.util.*;
 
+import javax.xml.namespace.*;
+
 /**
  * The PRES-CONTENT description element.
  * <p/>
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/prescontent/EncodingType.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/prescontent/EncodingType.java
index a4d387f..62b3903 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/prescontent/EncodingType.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/prescontent/EncodingType.java
@@ -6,9 +6,10 @@
  */
 package net.java.sip.communicator.impl.protocol.sip.xcap.model.prescontent;
 
-import javax.xml.namespace.*;
 import java.util.*;
 
+import javax.xml.namespace.*;
+
 /**
  * The PRES-CONTENT encoding element.
  * <p/>
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/prescontent/MimeType.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/prescontent/MimeType.java
index 5641870..7e5e5c0 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/prescontent/MimeType.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/prescontent/MimeType.java
@@ -6,9 +6,10 @@
  */
 package net.java.sip.communicator.impl.protocol.sip.xcap.model.prescontent;
 
-import javax.xml.namespace.*;
 import java.util.*;
 
+import javax.xml.namespace.*;
+
 /**
  * The PRES-CONTENT mime-type element.
  * <p/>
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/prescontent/PresContentParser.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/prescontent/PresContentParser.java
index 91d73bd..477d429 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/prescontent/PresContentParser.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/prescontent/PresContentParser.java
@@ -6,17 +6,23 @@
  */
 package net.java.sip.communicator.impl.protocol.sip.xcap.model.prescontent;
 
-import net.java.sip.communicator.impl.protocol.sip.xcap.model.*;
-import static net.java.sip.communicator.util.StringUtils.*;
-import static net.java.sip.communicator.util.xml.XMLUtils.*;
-import static net.java.sip.communicator.impl.protocol.sip.xcap.model.XmlUtils.*;
-
-import static javax.xml.XMLConstants.*;
+import static javax.xml.XMLConstants.XML_NS_PREFIX;
+import static javax.xml.XMLConstants.XML_NS_URI;
+import static net.java.sip.communicator.impl.protocol.sip.xcap.model.XmlUtils.processAny;
+import static net.java.sip.communicator.impl.protocol.sip.xcap.model.XmlUtils.processAnyAttributes;
+import static net.java.sip.communicator.util.StringUtils.isNullOrEmpty;
+import static net.java.sip.communicator.util.xml.XMLUtils.createDocument;
+import static net.java.sip.communicator.util.xml.XMLUtils.createXml;
+import static net.java.sip.communicator.util.xml.XMLUtils.getNamespaceUri;
+import static net.java.sip.communicator.util.xml.XMLUtils.isStandartXmlNamespace;
 
-import org.w3c.dom.*;
+import java.util.*;
 
 import javax.xml.namespace.*;
-import java.util.*;
+
+import net.java.sip.communicator.impl.protocol.sip.xcap.model.*;
+
+import org.w3c.dom.*;
 
 /**
  * Utility class that helps to converts pres-content xml to the object model and
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/presrules/PresRulesParser.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/presrules/PresRulesParser.java
index f48ee4d..998b587 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/presrules/PresRulesParser.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/presrules/PresRulesParser.java
@@ -6,9 +6,12 @@
  */
 package net.java.sip.communicator.impl.protocol.sip.xcap.model.presrules;
 
-import static net.java.sip.communicator.util.xml.XMLUtils.*;
-import static net.java.sip.communicator.impl.protocol.sip.xcap.model.XmlUtils.*;
+import static net.java.sip.communicator.impl.protocol.sip.xcap.model.XmlUtils.processAny;
+import static net.java.sip.communicator.util.xml.XMLUtils.getNamespaceUri;
+import static net.java.sip.communicator.util.xml.XMLUtils.hasChildElements;
+import static net.java.sip.communicator.util.xml.XMLUtils.isStandartXmlNamespace;
 import net.java.sip.communicator.impl.protocol.sip.xcap.model.commonpolicy.*;
+
 import org.w3c.dom.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/presrules/ProvideDevicePermissionType.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/presrules/ProvideDevicePermissionType.java
index 53af0e2..12d1b28 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/presrules/ProvideDevicePermissionType.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/presrules/ProvideDevicePermissionType.java
@@ -6,10 +6,10 @@
  */
 package net.java.sip.communicator.impl.protocol.sip.xcap.model.presrules;
 
-import org.w3c.dom.*;
-
 import java.util.*;
 
+import org.w3c.dom.*;
+
 /**
  * The Presence Rules provide-devices element. Allows a watcher to see "device"
  * information present in the presence document.
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/presrules/ProvidePersonPermissionType.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/presrules/ProvidePersonPermissionType.java
index 57f6bb4..43aed60 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/presrules/ProvidePersonPermissionType.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/presrules/ProvidePersonPermissionType.java
@@ -6,10 +6,10 @@
  */
 package net.java.sip.communicator.impl.protocol.sip.xcap.model.presrules;
 
-import org.w3c.dom.*;
-
 import java.util.*;
 
+import org.w3c.dom.*;
+
 /**
  * The Presence Rules provide-person element. Allows a watcher to see the
  * "person" information present in the presence document.
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/presrules/ProvideServicePermissionType.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/presrules/ProvideServicePermissionType.java
index ffa5f0c..3f1b8f6 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/presrules/ProvideServicePermissionType.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/presrules/ProvideServicePermissionType.java
@@ -6,10 +6,10 @@
  */
 package net.java.sip.communicator.impl.protocol.sip.xcap.model.presrules;
 
-import org.w3c.dom.*;
-
 import java.util.*;
 
+import org.w3c.dom.*;
+
 /**
  * The Presence Rules provide-dservices element. Allows a watcher to see service
  * information present in "tuple" elements in the presence document the
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/resourcelists/EntryRefType.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/resourcelists/EntryRefType.java
index 89a1ef5..713a567 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/resourcelists/EntryRefType.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/resourcelists/EntryRefType.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.impl.protocol.sip.xcap.model.resourcelists;
 
 import java.util.*;
+
 import javax.xml.namespace.*;
 
 import org.w3c.dom.*;
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/resourcelists/EntryType.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/resourcelists/EntryType.java
index 587a36d..54df1bf 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/resourcelists/EntryType.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/resourcelists/EntryType.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.impl.protocol.sip.xcap.model.resourcelists;
 
 import java.util.*;
+
 import javax.xml.namespace.*;
 
 import org.w3c.dom.*;
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/resourcelists/ExternalType.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/resourcelists/ExternalType.java
index cdd2640..a1f303f 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/resourcelists/ExternalType.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/resourcelists/ExternalType.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.impl.protocol.sip.xcap.model.resourcelists;
 
 import java.util.*;
+
 import javax.xml.namespace.*;
 
 import org.w3c.dom.*;
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/resourcelists/ListType.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/resourcelists/ListType.java
index e6b27ac..9e2ee6e 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/resourcelists/ListType.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/resourcelists/ListType.java
@@ -6,10 +6,11 @@
  */
 package net.java.sip.communicator.impl.protocol.sip.xcap.model.resourcelists;
 
-import org.w3c.dom.*;
+import java.util.*;
 
 import javax.xml.namespace.*;
-import java.util.*;
+
+import org.w3c.dom.*;
 
 /**
  * The XCAP list element.
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/resourcelists/ResourceListsParser.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/resourcelists/ResourceListsParser.java
index 02f2fae..5df1404 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/resourcelists/ResourceListsParser.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/resourcelists/ResourceListsParser.java
@@ -6,15 +6,22 @@
  */
 package net.java.sip.communicator.impl.protocol.sip.xcap.model.resourcelists;
 
-import static net.java.sip.communicator.util.StringUtils.*;
-import static net.java.sip.communicator.util.xml.XMLUtils.*;
-import static net.java.sip.communicator.impl.protocol.sip.xcap.model.XmlUtils.*;
-import net.java.sip.communicator.impl.protocol.sip.xcap.model.*;
-import org.w3c.dom.*;
+import static javax.xml.XMLConstants.XML_NS_PREFIX;
+import static javax.xml.XMLConstants.XML_NS_URI;
+import static net.java.sip.communicator.impl.protocol.sip.xcap.model.XmlUtils.processAny;
+import static net.java.sip.communicator.impl.protocol.sip.xcap.model.XmlUtils.processAnyAttributes;
+import static net.java.sip.communicator.util.StringUtils.isNullOrEmpty;
+import static net.java.sip.communicator.util.xml.XMLUtils.createDocument;
+import static net.java.sip.communicator.util.xml.XMLUtils.createXml;
+import static net.java.sip.communicator.util.xml.XMLUtils.getNamespaceUri;
+import static net.java.sip.communicator.util.xml.XMLUtils.isStandartXmlNamespace;
 
-import static javax.xml.XMLConstants.*;
 import javax.xml.namespace.*;
 
+import net.java.sip.communicator.impl.protocol.sip.xcap.model.*;
+
+import org.w3c.dom.*;
+
 /**
  * Utility class that helps to converts resource-lists xml to the object model
  * and object model to the resource-lists xml.
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/xcapcaps/XCapCapsParser.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/xcapcaps/XCapCapsParser.java
index d3c7f82..d740d6c 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/xcapcaps/XCapCapsParser.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/xcapcaps/XCapCapsParser.java
@@ -6,9 +6,12 @@
  */
 package net.java.sip.communicator.impl.protocol.sip.xcap.model.xcapcaps;
 
-import static net.java.sip.communicator.util.StringUtils.*;
-import static net.java.sip.communicator.util.xml.XMLUtils.*;
+import static net.java.sip.communicator.util.StringUtils.isNullOrEmpty;
+import static net.java.sip.communicator.util.xml.XMLUtils.createDocument;
+import static net.java.sip.communicator.util.xml.XMLUtils.getNamespaceUri;
+import static net.java.sip.communicator.util.xml.XMLUtils.isStandartXmlNamespace;
 import net.java.sip.communicator.impl.protocol.sip.xcap.model.*;
+
 import org.w3c.dom.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/xcapcaps/XCapCapsType.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/xcapcaps/XCapCapsType.java
index 6d68a72..797c499 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/xcapcaps/XCapCapsType.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/xcapcaps/XCapCapsType.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.impl.protocol.sip.xcap.model.xcapcaps;
 
 import java.util.*;
+
 import org.w3c.dom.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/xcaperror/XCapErrorParser.java b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/xcaperror/XCapErrorParser.java
index 4fba672..f804d6d 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/xcaperror/XCapErrorParser.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/xcap/model/xcaperror/XCapErrorParser.java
@@ -6,9 +6,11 @@
  */
 package net.java.sip.communicator.impl.protocol.sip.xcap.model.xcaperror;
 
+import static net.java.sip.communicator.util.StringUtils.isNullOrEmpty;
+import static net.java.sip.communicator.util.xml.XMLUtils.createDocument;
+import static net.java.sip.communicator.util.xml.XMLUtils.getNamespaceUri;
+import static net.java.sip.communicator.util.xml.XMLUtils.isStandartXmlNamespace;
 import net.java.sip.communicator.impl.protocol.sip.xcap.model.*;
-import static net.java.sip.communicator.util.StringUtils.*;
-import static net.java.sip.communicator.util.xml.XMLUtils.*;
 
 import org.w3c.dom.*;
 
diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/ContactGroupSSHImpl.java b/src/net/java/sip/communicator/impl/protocol/ssh/ContactGroupSSHImpl.java
index 6f2f9d4..11166b0 100644
--- a/src/net/java/sip/communicator/impl/protocol/ssh/ContactGroupSSHImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/ContactGroupSSHImpl.java
@@ -12,6 +12,7 @@
 package net.java.sip.communicator.impl.protocol.ssh;
 
 import java.util.*;
+
 import net.java.sip.communicator.service.protocol.*;
 
 /**
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 c609d7f..340ee00 100644
--- a/src/net/java/sip/communicator/impl/protocol/ssh/ContactSSH.java
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/ContactSSH.java
@@ -12,10 +12,11 @@
 package net.java.sip.communicator.impl.protocol.ssh;
 
 import java.io.*;
-import com.jcraft.jsch.*;
 
 import net.java.sip.communicator.service.protocol.*;
 
+import com.jcraft.jsch.*;
+
 /**
  * This interface represents a Contact of SSH Type
  * As a SSH Session is specific to a contact, additional information needed
diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/ContactTimerSSHImpl.java b/src/net/java/sip/communicator/impl/protocol/ssh/ContactTimerSSHImpl.java
index 4726d2b..72f6a5d 100644
--- a/src/net/java/sip/communicator/impl/protocol/ssh/ContactTimerSSHImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/ContactTimerSSHImpl.java
@@ -11,9 +11,10 @@
 
 package net.java.sip.communicator.impl.protocol.ssh;
 
-import java.io.IOException;
+import java.io.*;
 import java.net.*;
 import java.util.*;
+
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/ProtocolProviderFactorySSH.java b/src/net/java/sip/communicator/impl/protocol/ssh/ProtocolProviderFactorySSH.java
index a54bd08..bd09d5e 100644
--- a/src/net/java/sip/communicator/impl/protocol/ssh/ProtocolProviderFactorySSH.java
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/ProtocolProviderFactorySSH.java
@@ -12,10 +12,10 @@
 
 package net.java.sip.communicator.impl.protocol.ssh;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.protocol.*;
 
+import org.osgi.framework.*;
+
 /**
  *
  * @author Shobhit Jindal
diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/ProtocolProviderFactorySSHImpl.java b/src/net/java/sip/communicator/impl/protocol/ssh/ProtocolProviderFactorySSHImpl.java
index 8355306..703c0e4 100644
--- a/src/net/java/sip/communicator/impl/protocol/ssh/ProtocolProviderFactorySSHImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/ProtocolProviderFactorySSHImpl.java
@@ -13,10 +13,10 @@ package net.java.sip.communicator.impl.protocol.ssh;
 
 import java.util.*;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.protocol.*;
 
+import org.osgi.framework.*;
+
 /**
  * The SSH protocol provider factory creates instances of the SSH
  * protocol provider service. One Service instance corresponds to one account.
diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/ProtocolProviderServiceSSHImpl.java b/src/net/java/sip/communicator/impl/protocol/ssh/ProtocolProviderServiceSSHImpl.java
index ee303d3..2659467 100644
--- a/src/net/java/sip/communicator/impl/protocol/ssh/ProtocolProviderServiceSSHImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/ProtocolProviderServiceSSHImpl.java
@@ -15,10 +15,10 @@ import java.io.*;
 
 import javax.swing.*;
 
+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.Logger;
-import net.java.sip.communicator.service.gui.*;
 
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/SSHAccountID.java b/src/net/java/sip/communicator/impl/protocol/ssh/SSHAccountID.java
index b7bdb01..addf798 100644
--- a/src/net/java/sip/communicator/impl/protocol/ssh/SSHAccountID.java
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/SSHAccountID.java
@@ -12,8 +12,9 @@
 
 package net.java.sip.communicator.impl.protocol.ssh;
 
+import java.util.*;
+
 import net.java.sip.communicator.service.protocol.*;
-import java.util.Map;
 
 /**
  * The SSH implementation of a sip-communicator account id.
diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/SSHContactInfo.java b/src/net/java/sip/communicator/impl/protocol/ssh/SSHContactInfo.java
index 1b5f31a..3282041 100644
--- a/src/net/java/sip/communicator/impl/protocol/ssh/SSHContactInfo.java
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/SSHContactInfo.java
@@ -13,7 +13,7 @@ package net.java.sip.communicator.impl.protocol.ssh;
 
 import java.awt.*;
 import java.awt.event.*;
-import java.text.ParseException;
+import java.text.*;
 
 import javax.swing.*;
 import javax.swing.text.*;
diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/SSHUserInfo.java b/src/net/java/sip/communicator/impl/protocol/ssh/SSHUserInfo.java
index 38811d7..735ef0e 100644
--- a/src/net/java/sip/communicator/impl/protocol/ssh/SSHUserInfo.java
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/SSHUserInfo.java
@@ -12,9 +12,10 @@
 
 package net.java.sip.communicator.impl.protocol.ssh;
 
-import com.jcraft.jsch.*;
 import javax.swing.*;
 
+import com.jcraft.jsch.*;
+
 /**
  * SSHUserInfo passes authentication details to JSch SSH Stack
  *
diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/AdHocChatRoomYahooImpl.java b/src/net/java/sip/communicator/impl/protocol/yahoo/AdHocChatRoomYahooImpl.java
index e8b7608..2f91be1 100644
--- a/src/net/java/sip/communicator/impl/protocol/yahoo/AdHocChatRoomYahooImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/yahoo/AdHocChatRoomYahooImpl.java
@@ -9,10 +9,10 @@ package net.java.sip.communicator.impl.protocol.yahoo;
 import java.io.*;
 import java.util.*;
 
-import ymsg.network.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
+import ymsg.network.*;
 
 /**
  * Represents a Yahoo ad-hoc chat room, where multiple chat users could 
diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/ContactGroupYahooImpl.java b/src/net/java/sip/communicator/impl/protocol/yahoo/ContactGroupYahooImpl.java
index f4a1fea..a1c5743 100644
--- a/src/net/java/sip/communicator/impl/protocol/yahoo/ContactGroupYahooImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/yahoo/ContactGroupYahooImpl.java
@@ -9,7 +9,6 @@ package net.java.sip.communicator.impl.protocol.yahoo;
 import java.util.*;
 
 import net.java.sip.communicator.service.protocol.*;
-
 import ymsg.network.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/ContactYahooImpl.java b/src/net/java/sip/communicator/impl/protocol/yahoo/ContactYahooImpl.java
index 8370cb5..799c1ad 100644
--- a/src/net/java/sip/communicator/impl/protocol/yahoo/ContactYahooImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/yahoo/ContactYahooImpl.java
@@ -7,8 +7,8 @@
 package net.java.sip.communicator.impl.protocol.yahoo;
 
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.service.protocol.yahooconstants.*;
+import net.java.sip.communicator.util.*;
 import ymsg.network.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/IncomingFileTransferRequestYahooImpl.java b/src/net/java/sip/communicator/impl/protocol/yahoo/IncomingFileTransferRequestYahooImpl.java
index d5cda3c..cf418ff 100644
--- a/src/net/java/sip/communicator/impl/protocol/yahoo/IncomingFileTransferRequestYahooImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/yahoo/IncomingFileTransferRequestYahooImpl.java
@@ -6,8 +6,8 @@
  */
 package net.java.sip.communicator.impl.protocol.yahoo;
 
-import java.util.*;
 import java.io.*;
+import java.util.*;
 
 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/yahoo/OperationSetAdHocMultiUserChatYahooImpl.java b/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetAdHocMultiUserChatYahooImpl.java
index 44f8c0b..57895c2 100644
--- a/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetAdHocMultiUserChatYahooImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetAdHocMultiUserChatYahooImpl.java
@@ -9,12 +9,11 @@ package net.java.sip.communicator.impl.protocol.yahoo;
 import java.io.*;
 import java.util.*;
 
-import ymsg.network.*;
-import ymsg.network.event.*;
-
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
+import ymsg.network.*;
+import ymsg.network.event.*;
 
 /**
  * A Yahoo implementation of the ad-hoc multi user chat operation set.
diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetFileTransferYahooImpl.java b/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetFileTransferYahooImpl.java
index bc3b0ad..e125a30 100644
--- a/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetFileTransferYahooImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetFileTransferYahooImpl.java
@@ -12,7 +12,6 @@ import java.util.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
-
 import ymsg.network.event.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/ProtocolProviderFactoryYahooImpl.java b/src/net/java/sip/communicator/impl/protocol/yahoo/ProtocolProviderFactoryYahooImpl.java
index 227565f..177c793 100644
--- a/src/net/java/sip/communicator/impl/protocol/yahoo/ProtocolProviderFactoryYahooImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/yahoo/ProtocolProviderFactoryYahooImpl.java
@@ -8,10 +8,10 @@ package net.java.sip.communicator.impl.protocol.yahoo;
 
 import java.util.*;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.protocol.*;
 
+import org.osgi.framework.*;
+
 /**
  * The Yahoo implementation of the ProtocolProviderFactory.
  * @author Damian Minkov
diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/ProtocolProviderServiceYahooImpl.java b/src/net/java/sip/communicator/impl/protocol/yahoo/ProtocolProviderServiceYahooImpl.java
index bc2414d..0bf548c 100644
--- a/src/net/java/sip/communicator/impl/protocol/yahoo/ProtocolProviderServiceYahooImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/yahoo/ProtocolProviderServiceYahooImpl.java
@@ -12,7 +12,6 @@ import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.dns.*;
-
 import ymsg.network.*;
 import ymsg.network.event.*;
 
diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/YahooActivator.java b/src/net/java/sip/communicator/impl/protocol/yahoo/YahooActivator.java
index 7b50632..4f413c1 100644
--- a/src/net/java/sip/communicator/impl/protocol/yahoo/YahooActivator.java
+++ b/src/net/java/sip/communicator/impl/protocol/yahoo/YahooActivator.java
@@ -8,9 +8,9 @@ package net.java.sip.communicator.impl.protocol.yahoo;
 
 import java.util.*;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.protocol.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/YahooSession.java b/src/net/java/sip/communicator/impl/protocol/yahoo/YahooSession.java
index 308a818..8f2ef60 100644
--- a/src/net/java/sip/communicator/impl/protocol/yahoo/YahooSession.java
+++ b/src/net/java/sip/communicator/impl/protocol/yahoo/YahooSession.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.impl.protocol.yahoo;
 
 import java.io.*;
+
 import ymsg.network.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/protocol/zeroconf/ContactZeroconfImpl.java b/src/net/java/sip/communicator/impl/protocol/zeroconf/ContactZeroconfImpl.java
index 544e80a..423e601 100644
--- a/src/net/java/sip/communicator/impl/protocol/zeroconf/ContactZeroconfImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/zeroconf/ContactZeroconfImpl.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.impl.protocol.zeroconf;
 
 import java.net.*;
+
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
diff --git a/src/net/java/sip/communicator/impl/protocol/zeroconf/ProtocolProviderFactoryZeroconfImpl.java b/src/net/java/sip/communicator/impl/protocol/zeroconf/ProtocolProviderFactoryZeroconfImpl.java
index e171214..bb055c8 100644
--- a/src/net/java/sip/communicator/impl/protocol/zeroconf/ProtocolProviderFactoryZeroconfImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/zeroconf/ProtocolProviderFactoryZeroconfImpl.java
@@ -8,10 +8,10 @@ package net.java.sip.communicator.impl.protocol.zeroconf;
 
 import java.util.*;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.protocol.*;
 
+import org.osgi.framework.*;
+
 /**
  * The Zeroconf protocol provider factory creates instances of the Zeroconf
  * protocol provider service. One Service instance corresponds to one account.
diff --git a/src/net/java/sip/communicator/impl/protocol/zeroconf/ZeroconfAccountID.java b/src/net/java/sip/communicator/impl/protocol/zeroconf/ZeroconfAccountID.java
index dbd9388..15da8da 100644
--- a/src/net/java/sip/communicator/impl/protocol/zeroconf/ZeroconfAccountID.java
+++ b/src/net/java/sip/communicator/impl/protocol/zeroconf/ZeroconfAccountID.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.impl.protocol.zeroconf;
 
 import java.util.*;
+
 import net.java.sip.communicator.service.protocol.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/protocol/zeroconf/ZeroconfActivator.java b/src/net/java/sip/communicator/impl/protocol/zeroconf/ZeroconfActivator.java
index fc98d1b..07e3f05 100644
--- a/src/net/java/sip/communicator/impl/protocol/zeroconf/ZeroconfActivator.java
+++ b/src/net/java/sip/communicator/impl/protocol/zeroconf/ZeroconfActivator.java
@@ -7,9 +7,11 @@
 package net.java.sip.communicator.impl.protocol.zeroconf;
 
 import java.util.*;
-import org.osgi.framework.*;
-import net.java.sip.communicator.util.*;
+
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.util.*;
+
+import org.osgi.framework.*;
 
 /**
  * Loads the Zeroconf provider factory and registers its services in the OSGI
diff --git a/src/net/java/sip/communicator/impl/protocol/zeroconf/jmdns/DNSCache.java b/src/net/java/sip/communicator/impl/protocol/zeroconf/jmdns/DNSCache.java
index 03706b0..0843eef 100644
--- a/src/net/java/sip/communicator/impl/protocol/zeroconf/jmdns/DNSCache.java
+++ b/src/net/java/sip/communicator/impl/protocol/zeroconf/jmdns/DNSCache.java
@@ -4,6 +4,7 @@
 package net.java.sip.communicator.impl.protocol.zeroconf.jmdns;
 
 import java.util.*;
+
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/protocol/zeroconf/jmdns/JmDNS.java b/src/net/java/sip/communicator/impl/protocol/zeroconf/jmdns/JmDNS.java
index 1f19c42..e28cac5 100644
--- a/src/net/java/sip/communicator/impl/protocol/zeroconf/jmdns/JmDNS.java
+++ b/src/net/java/sip/communicator/impl/protocol/zeroconf/jmdns/JmDNS.java
@@ -7,6 +7,7 @@ package net.java.sip.communicator.impl.protocol.zeroconf.jmdns;
 import java.io.*;
 import java.net.*;
 import java.util.*;
+
 import net.java.sip.communicator.util.*;
 
 // REMIND: multiple IP addresses
diff --git a/src/net/java/sip/communicator/impl/provdisc/dhcp/DHCPProvisioningDiscover.java b/src/net/java/sip/communicator/impl/provdisc/dhcp/DHCPProvisioningDiscover.java
index 3ef5bee..f307ef8 100644
--- a/src/net/java/sip/communicator/impl/provdisc/dhcp/DHCPProvisioningDiscover.java
+++ b/src/net/java/sip/communicator/impl/provdisc/dhcp/DHCPProvisioningDiscover.java
@@ -9,8 +9,8 @@ package net.java.sip.communicator.impl.provdisc.dhcp;
 import java.net.*;
 import java.util.*;
 
-import net.java.sip.communicator.service.provdisc.event.*;
 import net.java.sip.communicator.service.netaddr.*;
+import net.java.sip.communicator.service.provdisc.event.*;
 import net.java.sip.communicator.util.*;
 
 import org.dhcp4java.*;
diff --git a/src/net/java/sip/communicator/impl/provdisc/dhcp/ProvisioningDiscoveryDHCPActivator.java b/src/net/java/sip/communicator/impl/provdisc/dhcp/ProvisioningDiscoveryDHCPActivator.java
index 5bb9e1b..8c43c77 100644
--- a/src/net/java/sip/communicator/impl/provdisc/dhcp/ProvisioningDiscoveryDHCPActivator.java
+++ b/src/net/java/sip/communicator/impl/provdisc/dhcp/ProvisioningDiscoveryDHCPActivator.java
@@ -6,12 +6,12 @@
  */
 package net.java.sip.communicator.impl.provdisc.dhcp;
 
-import org.osgi.framework.*;
-
-import net.java.sip.communicator.service.provdisc.*;
 import net.java.sip.communicator.service.netaddr.*;
+import net.java.sip.communicator.service.provdisc.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * Implements <tt>BundleActivator</tt> for the DHCP provisioning bundle.
  *
diff --git a/src/net/java/sip/communicator/impl/provdisc/mdns/MDNSProvisioningDiscover.java b/src/net/java/sip/communicator/impl/provdisc/mdns/MDNSProvisioningDiscover.java
index fec6260..263448d 100644
--- a/src/net/java/sip/communicator/impl/provdisc/mdns/MDNSProvisioningDiscover.java
+++ b/src/net/java/sip/communicator/impl/provdisc/mdns/MDNSProvisioningDiscover.java
@@ -9,11 +9,11 @@ package net.java.sip.communicator.impl.provdisc.mdns;
 import java.io.*;
 import java.util.*;
 
+import javax.jmdns.*;
+
 import net.java.sip.communicator.service.provdisc.event.*;
 import net.java.sip.communicator.util.*;
 
-import javax.jmdns.*;
-
 /**
  * Class that will perform mDNS provisioning discovery.
  *
diff --git a/src/net/java/sip/communicator/impl/replacement/bliptv/ReplacementServiceBliptvImpl.java b/src/net/java/sip/communicator/impl/replacement/bliptv/ReplacementServiceBliptvImpl.java
index 8942201..3534c26 100644
--- a/src/net/java/sip/communicator/impl/replacement/bliptv/ReplacementServiceBliptvImpl.java
+++ b/src/net/java/sip/communicator/impl/replacement/bliptv/ReplacementServiceBliptvImpl.java
@@ -8,11 +8,11 @@ package net.java.sip.communicator.impl.replacement.bliptv;
 import java.io.*;
 import java.net.*;
 
-import org.json.*;
-
 import net.java.sip.communicator.service.replacement.*;
 import net.java.sip.communicator.util.*;
 
+import org.json.*;
+
 /**
  * Implements the {@link ReplacementService} to provide previews for Blip.tv
  * links.
diff --git a/src/net/java/sip/communicator/impl/replacement/flickr/ReplacementServiceFlickrImpl.java b/src/net/java/sip/communicator/impl/replacement/flickr/ReplacementServiceFlickrImpl.java
index fe79e20..80b5767 100644
--- a/src/net/java/sip/communicator/impl/replacement/flickr/ReplacementServiceFlickrImpl.java
+++ b/src/net/java/sip/communicator/impl/replacement/flickr/ReplacementServiceFlickrImpl.java
@@ -9,11 +9,11 @@ import java.io.*;
 import java.net.*;
 import java.util.regex.*;
 
-import org.json.*;
-
 import net.java.sip.communicator.service.replacement.*;
 import net.java.sip.communicator.util.*;
 
+import org.json.*;
+
 /**
  * Implements the {@link ReplacementService} to provide previews for Flickr
  * links.
diff --git a/src/net/java/sip/communicator/impl/replacement/hulu/ReplacementServiceHuluImpl.java b/src/net/java/sip/communicator/impl/replacement/hulu/ReplacementServiceHuluImpl.java
index 58a5841..ca68452 100644
--- a/src/net/java/sip/communicator/impl/replacement/hulu/ReplacementServiceHuluImpl.java
+++ b/src/net/java/sip/communicator/impl/replacement/hulu/ReplacementServiceHuluImpl.java
@@ -8,11 +8,11 @@ package net.java.sip.communicator.impl.replacement.hulu;
 import java.io.*;
 import java.net.*;
 
-import org.json.*;
-
 import net.java.sip.communicator.service.replacement.*;
 import net.java.sip.communicator.util.*;
 
+import org.json.*;
+
 /**
  * Implements the {@link ReplacementService} to provide previews for Hulu links.
  * 
diff --git a/src/net/java/sip/communicator/impl/replacement/vimeo/ReplacementServiceVimeoImpl.java b/src/net/java/sip/communicator/impl/replacement/vimeo/ReplacementServiceVimeoImpl.java
index d330544..ddafaa4 100644
--- a/src/net/java/sip/communicator/impl/replacement/vimeo/ReplacementServiceVimeoImpl.java
+++ b/src/net/java/sip/communicator/impl/replacement/vimeo/ReplacementServiceVimeoImpl.java
@@ -5,15 +5,14 @@
  */
 package net.java.sip.communicator.impl.replacement.vimeo;
 
+import java.io.*;
 import java.net.*;
 import java.util.regex.*;
 
-import org.json.*;
-
 import net.java.sip.communicator.service.replacement.*;
 import net.java.sip.communicator.util.*;
 
-import java.io.*;
+import org.json.*;
 
 /**
  * Implements the {@link ReplacementService} to provide previews for Vimeo
diff --git a/src/net/java/sip/communicator/impl/resources/ResourceManagementActivator.java b/src/net/java/sip/communicator/impl/resources/ResourceManagementActivator.java
index e8f0238..e4e1e34 100644
--- a/src/net/java/sip/communicator/impl/resources/ResourceManagementActivator.java
+++ b/src/net/java/sip/communicator/impl/resources/ResourceManagementActivator.java
@@ -6,9 +6,9 @@
  */
 package net.java.sip.communicator.impl.resources;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/impl/sparkle/SparkleActivator.java b/src/net/java/sip/communicator/impl/sparkle/SparkleActivator.java
index 45637d3..9a83b6c 100644
--- a/src/net/java/sip/communicator/impl/sparkle/SparkleActivator.java
+++ b/src/net/java/sip/communicator/impl/sparkle/SparkleActivator.java
@@ -7,10 +7,10 @@
 package net.java.sip.communicator.impl.sparkle;
 
 import net.java.sip.communicator.service.resources.*;
-import org.osgi.framework.*;
+import net.java.sip.communicator.util.*;
 
 import org.jitsi.service.configuration.*;
-import net.java.sip.communicator.util.*;
+import org.osgi.framework.*;
 
 /**
  * Activates the Sparkle Framework
diff --git a/src/net/java/sip/communicator/impl/swingnotification/SwingNotificationActivator.java b/src/net/java/sip/communicator/impl/swingnotification/SwingNotificationActivator.java
index e22d629..d16f6ba 100644
--- a/src/net/java/sip/communicator/impl/swingnotification/SwingNotificationActivator.java
+++ b/src/net/java/sip/communicator/impl/swingnotification/SwingNotificationActivator.java
@@ -6,11 +6,11 @@
  */
 package net.java.sip.communicator.impl.swingnotification;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.service.systray.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/impl/version/VersionActivator.java b/src/net/java/sip/communicator/impl/version/VersionActivator.java
index 45da6be..907fae0 100644
--- a/src/net/java/sip/communicator/impl/version/VersionActivator.java
+++ b/src/net/java/sip/communicator/impl/version/VersionActivator.java
@@ -6,9 +6,9 @@
  */
 package net.java.sip.communicator.impl.version;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.version.*;
 import org.jitsi.service.version.Version;
 import org.osgi.framework.*;
diff --git a/src/net/java/sip/communicator/plugin/accountinfo/AccountDetailsPanel.java b/src/net/java/sip/communicator/plugin/accountinfo/AccountDetailsPanel.java
index 6365bfc..4425f92 100644
--- a/src/net/java/sip/communicator/plugin/accountinfo/AccountDetailsPanel.java
+++ b/src/net/java/sip/communicator/plugin/accountinfo/AccountDetailsPanel.java
@@ -15,7 +15,15 @@ import javax.imageio.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.protocol.ServerStoredDetails.*;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.BinaryDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.BirthDateDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.EmailAddressDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.FirstNameDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.GenderDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.GenericDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.LastNameDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.MiddleNameDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.PhoneNumberDetail;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.skin.*;
 import net.java.sip.communicator.util.swing.*;
diff --git a/src/net/java/sip/communicator/plugin/addrbook/PhoneNumberI18nServiceImpl.java b/src/net/java/sip/communicator/plugin/addrbook/PhoneNumberI18nServiceImpl.java
index 4a82eff..660333d 100644
--- a/src/net/java/sip/communicator/plugin/addrbook/PhoneNumberI18nServiceImpl.java
+++ b/src/net/java/sip/communicator/plugin/addrbook/PhoneNumberI18nServiceImpl.java
@@ -11,7 +11,7 @@ import java.util.*;
 import net.java.sip.communicator.service.protocol.*;

 

 import com.google.i18n.phonenumbers.*;

-import com.google.i18n.phonenumbers.Phonenumber.*;

+import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;

 

 /**

  * Implements <tt>PhoneNumberI18nService</tt> which aids the parsing, formatting

diff --git a/src/net/java/sip/communicator/plugin/addrbook/macosx/MacOSXAddrBookContactSourceService.java b/src/net/java/sip/communicator/plugin/addrbook/macosx/MacOSXAddrBookContactSourceService.java
index 8160d83..26c3857 100644
--- a/src/net/java/sip/communicator/plugin/addrbook/macosx/MacOSXAddrBookContactSourceService.java
+++ b/src/net/java/sip/communicator/plugin/addrbook/macosx/MacOSXAddrBookContactSourceService.java
@@ -8,7 +8,7 @@ package net.java.sip.communicator.plugin.addrbook.macosx;
 

 import java.util.regex.*;

 

-import net.java.sip.communicator.plugin.addrbook.AddrBookActivator;

+import net.java.sip.communicator.plugin.addrbook.*;

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

 

 /**

diff --git a/src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookAddrBookContactSourceService.java b/src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookAddrBookContactSourceService.java
index 8d78ba3..f94dac5 100644
--- a/src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookAddrBookContactSourceService.java
+++ b/src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookAddrBookContactSourceService.java
@@ -9,7 +9,7 @@ package net.java.sip.communicator.plugin.addrbook.msoutlook;
 import java.util.*;

 import java.util.regex.*;

 

-import net.java.sip.communicator.plugin.addrbook.AddrBookActivator;

+import net.java.sip.communicator.plugin.addrbook.*;

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

 

 /**

diff --git a/src/net/java/sip/communicator/plugin/branding/BrandingActivator.java b/src/net/java/sip/communicator/plugin/branding/BrandingActivator.java
index e0786ff..af7aeae 100644
--- a/src/net/java/sip/communicator/plugin/branding/BrandingActivator.java
+++ b/src/net/java/sip/communicator/plugin/branding/BrandingActivator.java
@@ -9,11 +9,11 @@ package net.java.sip.communicator.plugin.branding;
 import java.lang.reflect.*;
 import java.util.*;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/plugin/certconfig/CertConfigActivator.java b/src/net/java/sip/communicator/plugin/certconfig/CertConfigActivator.java
index 95d8880..82b1f0a 100644
--- a/src/net/java/sip/communicator/plugin/certconfig/CertConfigActivator.java
+++ b/src/net/java/sip/communicator/plugin/certconfig/CertConfigActivator.java
@@ -9,11 +9,11 @@ package net.java.sip.communicator.plugin.certconfig;
 import java.util.*;
 
 import net.java.sip.communicator.service.certificate.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.credentialsstorage.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/plugin/chatconfig/ChatConfigActivator.java b/src/net/java/sip/communicator/plugin/chatconfig/ChatConfigActivator.java
index 181c417..16f7db7 100644
--- a/src/net/java/sip/communicator/plugin/chatconfig/ChatConfigActivator.java
+++ b/src/net/java/sip/communicator/plugin/chatconfig/ChatConfigActivator.java
@@ -10,13 +10,13 @@ import java.util.*;
 
 import javax.swing.*;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.replacement.*;
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/plugin/chatconfig/ChatConfigPanel.java b/src/net/java/sip/communicator/plugin/chatconfig/ChatConfigPanel.java
index fbdedc7..faf91c3 100644
--- a/src/net/java/sip/communicator/plugin/chatconfig/ChatConfigPanel.java
+++ b/src/net/java/sip/communicator/plugin/chatconfig/ChatConfigPanel.java
@@ -6,6 +6,7 @@
 package net.java.sip.communicator.plugin.chatconfig;
 
 import java.awt.*;
+
 import javax.swing.*;
 
 import net.java.sip.communicator.plugin.chatconfig.replacement.*;
diff --git a/src/net/java/sip/communicator/plugin/chatconfig/replacement/ReplacementConfigPanel.java b/src/net/java/sip/communicator/plugin/chatconfig/replacement/ReplacementConfigPanel.java
index 117d935..7ea8e9d 100644
--- a/src/net/java/sip/communicator/plugin/chatconfig/replacement/ReplacementConfigPanel.java
+++ b/src/net/java/sip/communicator/plugin/chatconfig/replacement/ReplacementConfigPanel.java
@@ -7,6 +7,7 @@ package net.java.sip.communicator.plugin.chatconfig.replacement;
 
 import java.awt.*;
 import java.awt.event.*;
+import java.util.*;
 
 import javax.swing.*;
 import javax.swing.event.*;
@@ -14,11 +15,10 @@ import javax.swing.table.*;
 
 import net.java.sip.communicator.impl.replacement.smiley.*;
 import net.java.sip.communicator.plugin.chatconfig.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.replacement.*;
 import net.java.sip.communicator.util.swing.*;
 
-import java.util.*;
+import org.jitsi.service.configuration.*;
 
 /**
  * The <tt>ConfigurationForm</tt> that would be added in the chat configuration
diff --git a/src/net/java/sip/communicator/plugin/chatconfig/replacement/ReplacementConfigurationTableModel.java b/src/net/java/sip/communicator/plugin/chatconfig/replacement/ReplacementConfigurationTableModel.java
index 3f3d619..26f2fd5 100644
--- a/src/net/java/sip/communicator/plugin/chatconfig/replacement/ReplacementConfigurationTableModel.java
+++ b/src/net/java/sip/communicator/plugin/chatconfig/replacement/ReplacementConfigurationTableModel.java
@@ -10,9 +10,10 @@ import java.util.*;
 import javax.swing.table.*;
 
 import net.java.sip.communicator.plugin.chatconfig.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.replacement.*;
 
+import org.jitsi.service.configuration.*;
+
 /**
  * Table model for the table in <tt>ReplacementConfigPanel</tt> listing all
  * available replacement sources
diff --git a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java
index 3276d7e..e0bdf90 100644
--- a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java
+++ b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java
@@ -7,18 +7,27 @@ package net.java.sip.communicator.plugin.contactinfo;
 

 import java.awt.*;

 import java.awt.event.*;

-import java.util.*;

-

 import java.text.*;

-

+import java.util.*;

 import java.util.regex.*;

-import javax.swing.text.html.*;

 

 import javax.swing.*;

 import javax.swing.event.*;

+import javax.swing.text.html.*;

 

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

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

+import net.java.sip.communicator.service.protocol.ServerStoredDetails.BinaryDetail;

+import net.java.sip.communicator.service.protocol.ServerStoredDetails.BirthDateDetail;

+import net.java.sip.communicator.service.protocol.ServerStoredDetails.CalendarDetail;

+import net.java.sip.communicator.service.protocol.ServerStoredDetails.EmailAddressDetail;

+import net.java.sip.communicator.service.protocol.ServerStoredDetails.FirstNameDetail;

+import net.java.sip.communicator.service.protocol.ServerStoredDetails.GenderDetail;

+import net.java.sip.communicator.service.protocol.ServerStoredDetails.GenericDetail;

+import net.java.sip.communicator.service.protocol.ServerStoredDetails.LastNameDetail;

+import net.java.sip.communicator.service.protocol.ServerStoredDetails.LocaleDetail;

+import net.java.sip.communicator.service.protocol.ServerStoredDetails.MiddleNameDetail;

+import net.java.sip.communicator.service.protocol.ServerStoredDetails.PhoneNumberDetail;

+import net.java.sip.communicator.service.protocol.ServerStoredDetails.TimeZoneDetail;

 import net.java.sip.communicator.util.*;

 import net.java.sip.communicator.util.swing.*;

 

diff --git a/src/net/java/sip/communicator/plugin/contactsourceconfig/ContactSourceConfigActivator.java b/src/net/java/sip/communicator/plugin/contactsourceconfig/ContactSourceConfigActivator.java
index 6fde91b..9bfeda0 100644
--- a/src/net/java/sip/communicator/plugin/contactsourceconfig/ContactSourceConfigActivator.java
+++ b/src/net/java/sip/communicator/plugin/contactsourceconfig/ContactSourceConfigActivator.java
@@ -8,11 +8,11 @@ package net.java.sip.communicator.plugin.contactsourceconfig;
 import java.util.*;
 
 import net.java.sip.communicator.plugin.securityconfig.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/plugin/contactsourceconfig/ContactSourceConfigForm.java b/src/net/java/sip/communicator/plugin/contactsourceconfig/ContactSourceConfigForm.java
index bd23307..77984f7 100644
--- a/src/net/java/sip/communicator/plugin/contactsourceconfig/ContactSourceConfigForm.java
+++ b/src/net/java/sip/communicator/plugin/contactsourceconfig/ContactSourceConfigForm.java
@@ -10,11 +10,11 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.osgi.framework.*;
+
 /**
  *
  * @author Yana Stamcheva
diff --git a/src/net/java/sip/communicator/plugin/dictaccregwizz/StrategiesList.java b/src/net/java/sip/communicator/plugin/dictaccregwizz/StrategiesList.java
index b873954..d7dd6c4 100755
--- a/src/net/java/sip/communicator/plugin/dictaccregwizz/StrategiesList.java
+++ b/src/net/java/sip/communicator/plugin/dictaccregwizz/StrategiesList.java
@@ -6,8 +6,9 @@
  */
 package net.java.sip.communicator.plugin.dictaccregwizz;
 
-import java.awt.Component;
+import java.awt.*;
 import java.util.*;
+import java.util.List;
 
 import javax.swing.*;
 
diff --git a/src/net/java/sip/communicator/plugin/dictaccregwizz/ThreadManager.java b/src/net/java/sip/communicator/plugin/dictaccregwizz/ThreadManager.java
index d64789e..917c81a 100644
--- a/src/net/java/sip/communicator/plugin/dictaccregwizz/ThreadManager.java
+++ b/src/net/java/sip/communicator/plugin/dictaccregwizz/ThreadManager.java
@@ -8,9 +8,8 @@ package net.java.sip.communicator.plugin.dictaccregwizz;
 
 import java.util.*;
 
-import net.java.sip.communicator.util.*;
-
 import net.java.dict4j.*;
+import net.java.sip.communicator.util.*;
 
 /**
  * Class manager the thread called for searching the strategies' list
diff --git a/src/net/java/sip/communicator/plugin/dnsconfig/DnssecPanel.java b/src/net/java/sip/communicator/plugin/dnsconfig/DnssecPanel.java
index 2bdfde0..4d7134a 100644
--- a/src/net/java/sip/communicator/plugin/dnsconfig/DnssecPanel.java
+++ b/src/net/java/sip/communicator/plugin/dnsconfig/DnssecPanel.java
@@ -15,11 +15,11 @@ import javax.swing.plaf.basic.*;
 import javax.swing.table.*;

 

 import net.java.sip.communicator.impl.gui.customcontrols.*;

-import org.jitsi.service.configuration.*;

 import net.java.sip.communicator.util.*;

 import net.java.sip.communicator.util.dns.*;

 import net.java.sip.communicator.util.swing.*;

 

+import org.jitsi.service.configuration.*;

 import org.jitsi.service.resources.*;

 import org.osgi.framework.*;

 

diff --git a/src/net/java/sip/communicator/plugin/dnsconfig/DnssecTableModel.java b/src/net/java/sip/communicator/plugin/dnsconfig/DnssecTableModel.java
index 68ff775..424ee7c 100644
--- a/src/net/java/sip/communicator/plugin/dnsconfig/DnssecTableModel.java
+++ b/src/net/java/sip/communicator/plugin/dnsconfig/DnssecTableModel.java
@@ -12,10 +12,10 @@ import java.util.List;
 

 import javax.swing.table.*;

 

-import org.jitsi.service.configuration.*;

 import net.java.sip.communicator.util.*;

 import net.java.sip.communicator.util.dns.*;

 

+import org.jitsi.service.configuration.*;

 import org.jitsi.service.resources.*;

 import org.osgi.framework.*;

 

diff --git a/src/net/java/sip/communicator/plugin/dnsconfig/ParallelDnsPanel.java b/src/net/java/sip/communicator/plugin/dnsconfig/ParallelDnsPanel.java
index 85eca21..aeeb5a0 100644
--- a/src/net/java/sip/communicator/plugin/dnsconfig/ParallelDnsPanel.java
+++ b/src/net/java/sip/communicator/plugin/dnsconfig/ParallelDnsPanel.java
@@ -29,11 +29,11 @@ import javax.swing.*;
 import javax.swing.event.*;
 import javax.swing.text.*;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.dns.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/plugin/generalconfig/ConfigurationManager.java b/src/net/java/sip/communicator/plugin/generalconfig/ConfigurationManager.java
index 56f2aa4..9629f65 100644
--- a/src/net/java/sip/communicator/plugin/generalconfig/ConfigurationManager.java
+++ b/src/net/java/sip/communicator/plugin/generalconfig/ConfigurationManager.java
@@ -11,11 +11,11 @@ import java.util.*;
 
 import javax.net.ssl.*;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 
 public class ConfigurationManager
diff --git a/src/net/java/sip/communicator/plugin/generalconfig/GeneralConfigPluginActivator.java b/src/net/java/sip/communicator/plugin/generalconfig/GeneralConfigPluginActivator.java
index dfdb32f..f89971d 100644
--- a/src/net/java/sip/communicator/plugin/generalconfig/GeneralConfigPluginActivator.java
+++ b/src/net/java/sip/communicator/plugin/generalconfig/GeneralConfigPluginActivator.java
@@ -13,7 +13,6 @@ import javax.swing.*;
 import javax.swing.border.*;
 
 import net.java.sip.communicator.plugin.generalconfig.autoaway.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.resources.*;
@@ -21,6 +20,7 @@ import net.java.sip.communicator.service.systray.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/plugin/generalconfig/WindowsStartup.java b/src/net/java/sip/communicator/plugin/generalconfig/WindowsStartup.java
index 56cf344..c321548 100644
--- a/src/net/java/sip/communicator/plugin/generalconfig/WindowsStartup.java
+++ b/src/net/java/sip/communicator/plugin/generalconfig/WindowsStartup.java
@@ -6,10 +6,11 @@
  */
 package net.java.sip.communicator.plugin.generalconfig;
 
-import com.sun.jna.platform.win32.*;
+import java.io.*;
+
 import net.java.sip.communicator.util.*;
 
-import java.io.*;
+import com.sun.jna.platform.win32.*;
 
 /**
  * Take care of application auto startup. Reading and writing the registry.
diff --git a/src/net/java/sip/communicator/plugin/generalconfig/autoaway/AutoAwayConfigurationPanel.java b/src/net/java/sip/communicator/plugin/generalconfig/autoaway/AutoAwayConfigurationPanel.java
index b4fe353..4b2646e 100644
--- a/src/net/java/sip/communicator/plugin/generalconfig/autoaway/AutoAwayConfigurationPanel.java
+++ b/src/net/java/sip/communicator/plugin/generalconfig/autoaway/AutoAwayConfigurationPanel.java
@@ -13,9 +13,9 @@ import javax.swing.*;
 import javax.swing.event.*;
 
 import net.java.sip.communicator.plugin.generalconfig.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 
 /**
diff --git a/src/net/java/sip/communicator/plugin/generalconfig/autoaway/AutoAwayWatcher.java b/src/net/java/sip/communicator/plugin/generalconfig/autoaway/AutoAwayWatcher.java
index b9d5a74..80efeb8 100644
--- a/src/net/java/sip/communicator/plugin/generalconfig/autoaway/AutoAwayWatcher.java
+++ b/src/net/java/sip/communicator/plugin/generalconfig/autoaway/AutoAwayWatcher.java
@@ -6,17 +6,18 @@
  */

 package net.java.sip.communicator.plugin.generalconfig.autoaway;

 

+import java.beans.*;

+import java.util.*;

+

 import net.java.sip.communicator.plugin.generalconfig.*;

-import org.jitsi.service.configuration.*;

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

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

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

 import net.java.sip.communicator.service.sysactivity.event.*;

 import net.java.sip.communicator.util.*;

-import org.osgi.framework.*;

 

-import java.beans.*;

-import java.util.*;

+import org.jitsi.service.configuration.*;

+import org.osgi.framework.*;

 

 /**

  * Listens for idle events from SystemActivityNotifications Service.

diff --git a/src/net/java/sip/communicator/plugin/generalconfig/autoaway/StatusUpdateThread.java b/src/net/java/sip/communicator/plugin/generalconfig/autoaway/StatusUpdateThread.java
index 6399672..601f2b9 100644
--- a/src/net/java/sip/communicator/plugin/generalconfig/autoaway/StatusUpdateThread.java
+++ b/src/net/java/sip/communicator/plugin/generalconfig/autoaway/StatusUpdateThread.java
@@ -10,9 +10,9 @@ import java.awt.*;
 import java.util.*;
 
 import net.java.sip.communicator.plugin.generalconfig.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.protocol.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 
 /**
diff --git a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/FirstWizardPage.java
index 2cfff20..bd54660 100644
--- a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/FirstWizardPage.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.plugin.gibberishaccregwizz;
 
 import java.awt.*;
+
 import javax.swing.*;
 import javax.swing.event.*;
 
diff --git a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccRegWizzActivator.java b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccRegWizzActivator.java
index 3f489b6..6af53ae 100644
--- a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccRegWizzActivator.java
+++ b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccRegWizzActivator.java
@@ -8,12 +8,12 @@ package net.java.sip.communicator.plugin.gibberishaccregwizz;
 
 import java.util.*;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * Registers the <tt>GibberishAccountRegistrationWizard</tt> in the UI Service.
  *
diff --git a/src/net/java/sip/communicator/plugin/globalproxyconfig/GlobalProxyConfigForm.java b/src/net/java/sip/communicator/plugin/globalproxyconfig/GlobalProxyConfigForm.java
index 240f33d..819b7e6 100644
--- a/src/net/java/sip/communicator/plugin/globalproxyconfig/GlobalProxyConfigForm.java
+++ b/src/net/java/sip/communicator/plugin/globalproxyconfig/GlobalProxyConfigForm.java
@@ -9,11 +9,12 @@ import java.awt.*;
 import java.awt.event.*;
 
 import javax.swing.*;
-import org.jitsi.service.configuration.*;
 
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.configuration.*;
+
 /**
  * Implementation of the configuration form.
  *
diff --git a/src/net/java/sip/communicator/plugin/globalproxyconfig/GlobalProxyPluginActivator.java b/src/net/java/sip/communicator/plugin/globalproxyconfig/GlobalProxyPluginActivator.java
index 73bd752..3551dda 100644
--- a/src/net/java/sip/communicator/plugin/globalproxyconfig/GlobalProxyPluginActivator.java
+++ b/src/net/java/sip/communicator/plugin/globalproxyconfig/GlobalProxyPluginActivator.java
@@ -9,11 +9,11 @@ package net.java.sip.communicator.plugin.globalproxyconfig;
 import java.net.*;
 import java.util.*;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.osgi.framework.*;
 
 /**
diff --git a/src/net/java/sip/communicator/plugin/ippiaccregwizz/CreateIppiAccountForm.java b/src/net/java/sip/communicator/plugin/ippiaccregwizz/CreateIppiAccountForm.java
index 601314d..f7179b8 100644
--- a/src/net/java/sip/communicator/plugin/ippiaccregwizz/CreateIppiAccountForm.java
+++ b/src/net/java/sip/communicator/plugin/ippiaccregwizz/CreateIppiAccountForm.java
@@ -15,12 +15,12 @@ import java.text.*;
 import javax.swing.*;
 import javax.swing.text.*;
 
-import org.json.*;
-
 import net.java.sip.communicator.plugin.sipaccregwizz.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.json.*;
+
 /**
  * @author Yana Stamcheva
  * @author Damian Minkov
diff --git a/src/net/java/sip/communicator/plugin/ircaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/ircaccregwizz/FirstWizardPage.java
index 99353f4..0d166ad 100644
--- a/src/net/java/sip/communicator/plugin/ircaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/ircaccregwizz/FirstWizardPage.java
@@ -7,8 +7,7 @@
 package net.java.sip.communicator.plugin.ircaccregwizz;
 
 import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
+import java.awt.event.*;
 import java.util.*;
 
 import javax.swing.*;
diff --git a/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java
index d635a84..e1d9708 100644
--- a/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java
@@ -9,12 +9,12 @@ package net.java.sip.communicator.plugin.ircaccregwizz;
 import java.awt.*;
 import java.util.*;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * The <tt>IrcAccountRegistrationWizard</tt> is an implementation of the
  * <tt>AccountRegistrationWizard</tt> for the IRC protocol. It allows
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccRegWizzActivator.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccRegWizzActivator.java
index d9d03be..4a1a60b 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccRegWizzActivator.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccRegWizzActivator.java
@@ -8,15 +8,15 @@ package net.java.sip.communicator.plugin.jabberaccregwizz;
 
 import java.util.*;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.browserlauncher.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.credentialsstorage.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
+import org.osgi.framework.*;
+
 /**
  * Registers the <tt>JabberAccountRegistrationWizard</tt> in the UI Service.
  *
diff --git a/src/net/java/sip/communicator/plugin/keybindingchooser/ComponentTools.java b/src/net/java/sip/communicator/plugin/keybindingchooser/ComponentTools.java
index e0563fe..b9f0c92 100644
--- a/src/net/java/sip/communicator/plugin/keybindingchooser/ComponentTools.java
+++ b/src/net/java/sip/communicator/plugin/keybindingchooser/ComponentTools.java
@@ -1,11 +1,10 @@
 package net.java.sip.communicator.plugin.keybindingchooser;
 
 import java.awt.*;
-import java.awt.event.ActionEvent;
+import java.awt.event.*;
 
 import javax.swing.*;
-import javax.swing.border.BevelBorder;
-import javax.swing.border.Border;
+import javax.swing.border.*;
 
 /**
  * Common tools for Swing gui components.
diff --git a/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingChooserActivator.java b/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingChooserActivator.java
index 77e0a99..c3fc096 100644
--- a/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingChooserActivator.java
+++ b/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingChooserActivator.java
@@ -8,13 +8,13 @@ package net.java.sip.communicator.plugin.keybindingchooser;
 
 import java.util.*;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.globalshortcut.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.keybindings.*;
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigPanel.java b/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigPanel.java
index c8cf88a..bca0d61 100644
--- a/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigPanel.java
+++ b/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigPanel.java
@@ -12,13 +12,13 @@ import java.util.*;
 
 import javax.swing.*;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.plugin.keybindingchooser.chooser.*;
 import net.java.sip.communicator.plugin.keybindingchooser.globalchooser.*;
 import net.java.sip.communicator.service.keybindings.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.osgi.framework.*;
+
 /**
  * The <tt>ConfigurationForm</tt> that would be added to the settings
  * configuration to configure the application keybindings.
diff --git a/src/net/java/sip/communicator/plugin/keybindingchooser/chooser/BindingAdaptor.java b/src/net/java/sip/communicator/plugin/keybindingchooser/chooser/BindingAdaptor.java
index 31f0fb0..5fa6908 100644
--- a/src/net/java/sip/communicator/plugin/keybindingchooser/chooser/BindingAdaptor.java
+++ b/src/net/java/sip/communicator/plugin/keybindingchooser/chooser/BindingAdaptor.java
@@ -8,7 +8,7 @@ package net.java.sip.communicator.plugin.keybindingchooser.chooser;
 
 import java.awt.event.*;
 
-import javax.swing.KeyStroke;
+import javax.swing.*;
 
 /**
  * Adaptor that uses keyboard input to set the selected shortcut field of a
diff --git a/src/net/java/sip/communicator/plugin/keybindingchooser/chooser/BindingPanel.java b/src/net/java/sip/communicator/plugin/keybindingchooser/chooser/BindingPanel.java
index 1bd27a9..a90da52 100644
--- a/src/net/java/sip/communicator/plugin/keybindingchooser/chooser/BindingPanel.java
+++ b/src/net/java/sip/communicator/plugin/keybindingchooser/chooser/BindingPanel.java
@@ -8,9 +8,7 @@ package net.java.sip.communicator.plugin.keybindingchooser.chooser;
 
 import java.awt.*;
 import java.awt.event.*;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.Map;
+import java.util.*;
 
 import javax.swing.*;
 import javax.swing.event.*;
diff --git a/src/net/java/sip/communicator/plugin/keybindingchooser/globalchooser/GlobalShortcutEntry.java b/src/net/java/sip/communicator/plugin/keybindingchooser/globalchooser/GlobalShortcutEntry.java
index bcb8510..b76a647 100644
--- a/src/net/java/sip/communicator/plugin/keybindingchooser/globalchooser/GlobalShortcutEntry.java
+++ b/src/net/java/sip/communicator/plugin/keybindingchooser/globalchooser/GlobalShortcutEntry.java
@@ -6,11 +6,12 @@
  */
 package net.java.sip.communicator.plugin.keybindingchooser.globalchooser;
 
-import java.util.List; //disambiguation
 import java.awt.*;
 import java.awt.event.*;
+import java.util.List;
 
 import net.java.sip.communicator.service.globalshortcut.*;
+//disambiguation
 
 /**
  * Entry for a global shortcut.
diff --git a/src/net/java/sip/communicator/plugin/ldap/configform/DirectorySettingsForm.java b/src/net/java/sip/communicator/plugin/ldap/configform/DirectorySettingsForm.java
index 58cf858..78aa393 100644
--- a/src/net/java/sip/communicator/plugin/ldap/configform/DirectorySettingsForm.java
+++ b/src/net/java/sip/communicator/plugin/ldap/configform/DirectorySettingsForm.java
@@ -6,16 +6,20 @@
  */
 package net.java.sip.communicator.plugin.ldap.configform;
 
-import java.util.*;
-import java.util.List; //disambiguation
 import java.awt.*;
 import java.awt.event.*;
+import java.util.*;
+import java.util.List;
+
 import javax.swing.*;
 
-import net.java.sip.communicator.util.swing.*;
-import net.java.sip.communicator.service.ldap.*;
-import net.java.sip.communicator.service.ldap.LdapConstants.*;
 import net.java.sip.communicator.plugin.ldap.*;
+import net.java.sip.communicator.service.ldap.*;
+import net.java.sip.communicator.service.ldap.LdapConstants.Auth;
+import net.java.sip.communicator.service.ldap.LdapConstants.Encryption;
+import net.java.sip.communicator.service.ldap.LdapConstants.Scope;
+import net.java.sip.communicator.util.swing.*;
+//disambiguation
 
 /**
  * The page with hostname/port/encryption fields
diff --git a/src/net/java/sip/communicator/plugin/ldap/configform/LdapConfigForm.java b/src/net/java/sip/communicator/plugin/ldap/configform/LdapConfigForm.java
index fbb8d5c..adece93 100644
--- a/src/net/java/sip/communicator/plugin/ldap/configform/LdapConfigForm.java
+++ b/src/net/java/sip/communicator/plugin/ldap/configform/LdapConfigForm.java
@@ -8,14 +8,15 @@ package net.java.sip.communicator.plugin.ldap.configform;
 
 import java.awt.*;
 import java.awt.event.*;
+
 import javax.swing.*;
 import javax.swing.event.*;
 
-import net.java.sip.communicator.util.*;
-import net.java.sip.communicator.util.swing.*;
+import net.java.sip.communicator.plugin.ldap.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.ldap.*;
-import net.java.sip.communicator.plugin.ldap.*;
+import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
 
 /**
  * This ConfigurationForm shows the list of LDAP directories
diff --git a/src/net/java/sip/communicator/plugin/ldap/configform/LdapTableModel.java b/src/net/java/sip/communicator/plugin/ldap/configform/LdapTableModel.java
index 4bcfb19..1ad3dda 100644
--- a/src/net/java/sip/communicator/plugin/ldap/configform/LdapTableModel.java
+++ b/src/net/java/sip/communicator/plugin/ldap/configform/LdapTableModel.java
@@ -8,8 +8,8 @@ package net.java.sip.communicator.plugin.ldap.configform;
 
 import javax.swing.table.*;
 
-import net.java.sip.communicator.service.ldap.*;
 import net.java.sip.communicator.plugin.ldap.*;
+import net.java.sip.communicator.service.ldap.*;
 
 /**
  * A table model suitable for the directories list in
diff --git a/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccRegWizzActivator.java b/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccRegWizzActivator.java
index 1dd8134..6ffe22e 100644
--- a/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccRegWizzActivator.java
+++ b/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccRegWizzActivator.java
@@ -8,13 +8,13 @@ package net.java.sip.communicator.plugin.msnaccregwizz;
 
 import java.util.*;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.browserlauncher.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * Registers the <tt>MsnAccountRegistrationWizard</tt> in the UI Service.
  *
diff --git a/src/net/java/sip/communicator/plugin/nimbuzzavatars/NimbuzzAvatarsActivator.java b/src/net/java/sip/communicator/plugin/nimbuzzavatars/NimbuzzAvatarsActivator.java
index 14fb160..1f30c7e 100644
--- a/src/net/java/sip/communicator/plugin/nimbuzzavatars/NimbuzzAvatarsActivator.java
+++ b/src/net/java/sip/communicator/plugin/nimbuzzavatars/NimbuzzAvatarsActivator.java
@@ -6,12 +6,13 @@
  */
 package net.java.sip.communicator.plugin.nimbuzzavatars;
 
-import net.java.sip.communicator.service.customavatar.*;
-import org.osgi.framework.*;
-
 import java.io.*;
 import java.net.*;
 
+import net.java.sip.communicator.service.customavatar.*;
+
+import org.osgi.framework.*;
+
 /**
  * OSGi bundle activator for the Nimbuzz custom avatars service.
  * 
diff --git a/src/net/java/sip/communicator/plugin/otr/OtrActionHandlers.java b/src/net/java/sip/communicator/plugin/otr/OtrActionHandlers.java
index ede2733..cf94a1a 100644
--- a/src/net/java/sip/communicator/plugin/otr/OtrActionHandlers.java
+++ b/src/net/java/sip/communicator/plugin/otr/OtrActionHandlers.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.plugin.otr;

 

 import java.awt.*;

+

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

 

 /**

diff --git a/src/net/java/sip/communicator/plugin/otr/OtrActivator.java b/src/net/java/sip/communicator/plugin/otr/OtrActivator.java
index 6433999..56878ed 100644
--- a/src/net/java/sip/communicator/plugin/otr/OtrActivator.java
+++ b/src/net/java/sip/communicator/plugin/otr/OtrActivator.java
@@ -8,12 +8,12 @@ package net.java.sip.communicator.plugin.otr;
 
 import java.util.*;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/plugin/otr/OtrConfigurator.java b/src/net/java/sip/communicator/plugin/otr/OtrConfigurator.java
index 9eeeb69..76c46a1 100755
--- a/src/net/java/sip/communicator/plugin/otr/OtrConfigurator.java
+++ b/src/net/java/sip/communicator/plugin/otr/OtrConfigurator.java
@@ -6,9 +6,8 @@
  */

 package net.java.sip.communicator.plugin.otr;

 

-import org.jitsi.service.configuration.*;

-

 import org.bouncycastle.util.encoders.*;

+import org.jitsi.service.configuration.*;

 

 /**

  * A class that gets/sets the OTR configuration values. Introduced to assure our

diff --git a/src/net/java/sip/communicator/plugin/otr/ScOtrEngineImpl.java b/src/net/java/sip/communicator/plugin/otr/ScOtrEngineImpl.java
index b59080f..04c4bdc 100644
--- a/src/net/java/sip/communicator/plugin/otr/ScOtrEngineImpl.java
+++ b/src/net/java/sip/communicator/plugin/otr/ScOtrEngineImpl.java
@@ -10,14 +10,14 @@ import java.net.*;
 import java.security.*;

 import java.util.*;

 

-import org.osgi.framework.*;

-

 import net.java.otr4j.*;

 import net.java.otr4j.session.*;

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

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

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

 

+import org.osgi.framework.*;

+

 /**

  * @author George Politis

  */

diff --git a/src/net/java/sip/communicator/plugin/otr/ScSessionID.java b/src/net/java/sip/communicator/plugin/otr/ScSessionID.java
index cba4130..2d5f7c2 100644
--- a/src/net/java/sip/communicator/plugin/otr/ScSessionID.java
+++ b/src/net/java/sip/communicator/plugin/otr/ScSessionID.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.plugin.otr;

 

 import java.util.*;

+

 import net.java.otr4j.session.*;

 

 /**

diff --git a/src/net/java/sip/communicator/plugin/pluginmanager/BundleComparator.java b/src/net/java/sip/communicator/plugin/pluginmanager/BundleComparator.java
index 5670fe2..a442861 100644
--- a/src/net/java/sip/communicator/plugin/pluginmanager/BundleComparator.java
+++ b/src/net/java/sip/communicator/plugin/pluginmanager/BundleComparator.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.plugin.pluginmanager;
 
 import java.util.*;
+
 import org.osgi.framework.*;
 
 /**
diff --git a/src/net/java/sip/communicator/plugin/pluginmanager/PluginManagerActivator.java b/src/net/java/sip/communicator/plugin/pluginmanager/PluginManagerActivator.java
index 8c602f9..8773035 100644
--- a/src/net/java/sip/communicator/plugin/pluginmanager/PluginManagerActivator.java
+++ b/src/net/java/sip/communicator/plugin/pluginmanager/PluginManagerActivator.java
@@ -7,9 +7,9 @@ package net.java.sip.communicator.plugin.pluginmanager;
 
 import java.util.*;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.gui.*;
 
+import org.jitsi.service.configuration.*;
 import org.osgi.framework.*;
 
 /**
diff --git a/src/net/java/sip/communicator/plugin/profiler4j/ProfilerActivator.java b/src/net/java/sip/communicator/plugin/profiler4j/ProfilerActivator.java
index 3d4fdf2..76b0824 100644
--- a/src/net/java/sip/communicator/plugin/profiler4j/ProfilerActivator.java
+++ b/src/net/java/sip/communicator/plugin/profiler4j/ProfilerActivator.java
@@ -7,8 +7,10 @@
 package net.java.sip.communicator.plugin.profiler4j;
 
 import java.util.*;
+
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.util.*;
+
 import org.osgi.framework.*;
 
 /**
diff --git a/src/net/java/sip/communicator/plugin/provisioning/ProvisioningActivator.java b/src/net/java/sip/communicator/plugin/provisioning/ProvisioningActivator.java
index 9da4a69..16ef17c 100644
--- a/src/net/java/sip/communicator/plugin/provisioning/ProvisioningActivator.java
+++ b/src/net/java/sip/communicator/plugin/provisioning/ProvisioningActivator.java
@@ -8,7 +8,6 @@ package net.java.sip.communicator.plugin.provisioning;
 
 import java.util.*;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.credentialsstorage.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.netaddr.*;
@@ -16,6 +15,7 @@ import net.java.sip.communicator.service.provdisc.*;
 import net.java.sip.communicator.service.provisioning.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/plugin/provisioning/ProvisioningForm.java b/src/net/java/sip/communicator/plugin/provisioning/ProvisioningForm.java
index 636cf75..b35b0cf 100644
--- a/src/net/java/sip/communicator/plugin/provisioning/ProvisioningForm.java
+++ b/src/net/java/sip/communicator/plugin/provisioning/ProvisioningForm.java
@@ -13,10 +13,10 @@ import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 
 /**
diff --git a/src/net/java/sip/communicator/plugin/provisioning/ProvisioningServiceImpl.java b/src/net/java/sip/communicator/plugin/provisioning/ProvisioningServiceImpl.java
index 89e2fce..7b80a24 100644
--- a/src/net/java/sip/communicator/plugin/provisioning/ProvisioningServiceImpl.java
+++ b/src/net/java/sip/communicator/plugin/provisioning/ProvisioningServiceImpl.java
@@ -4,16 +4,18 @@ import java.awt.*;
 import java.io.*;
 import java.net.*;
 import java.util.*;
-import java.util.List; // disambiguation
+import java.util.List;
 
 import javax.swing.*;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.httputil.*;
 import net.java.sip.communicator.service.provisioning.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.swing.*;
+
+import org.jitsi.service.configuration.*;
 import org.osgi.framework.*;
+// disambiguation
 
 /**
  * Provisioning service.
diff --git a/src/net/java/sip/communicator/plugin/reconnectplugin/ReconnectPluginActivator.java b/src/net/java/sip/communicator/plugin/reconnectplugin/ReconnectPluginActivator.java
index db24090..b8983dd 100644
--- a/src/net/java/sip/communicator/plugin/reconnectplugin/ReconnectPluginActivator.java
+++ b/src/net/java/sip/communicator/plugin/reconnectplugin/ReconnectPluginActivator.java
@@ -8,7 +8,6 @@ package net.java.sip.communicator.plugin.reconnectplugin;
 
 import java.util.*;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.netaddr.*;
 import net.java.sip.communicator.service.netaddr.event.*;
@@ -17,6 +16,7 @@ import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/plugin/rssaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/rssaccregwizz/FirstWizardPage.java
index e7f6d21..7737cf2 100644
--- a/src/net/java/sip/communicator/plugin/rssaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/rssaccregwizz/FirstWizardPage.java
@@ -6,9 +6,8 @@
  */
 package net.java.sip.communicator.plugin.rssaccregwizz;
 
-import java.util.*;
-
 import java.awt.*;
+import java.util.*;
 
 import javax.swing.*;
 import javax.swing.event.*;
diff --git a/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccRegWizzActivator.java b/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccRegWizzActivator.java
index b8ff955..ffa534f 100644
--- a/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccRegWizzActivator.java
+++ b/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccRegWizzActivator.java
@@ -8,12 +8,12 @@ package net.java.sip.communicator.plugin.rssaccregwizz;
 
 import java.util.*;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * Registers the <tt>RssAccountRegistrationWizard</tt> in the UI Service.
  *
diff --git a/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java
index c292580..a20e231 100644
--- a/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java
@@ -9,12 +9,12 @@ package net.java.sip.communicator.plugin.rssaccregwizz;
 import java.awt.*;
 import java.util.*;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * The <tt>RssAccountRegistrationWizard</tt> is an implementation of the
  * <tt>AccountRegistrationWizard</tt> for the Rss protocol. It allows
diff --git a/src/net/java/sip/communicator/plugin/securityconfig/SecurityConfigActivator.java b/src/net/java/sip/communicator/plugin/securityconfig/SecurityConfigActivator.java
index 5a90a92..f4a6ea5 100644
--- a/src/net/java/sip/communicator/plugin/securityconfig/SecurityConfigActivator.java
+++ b/src/net/java/sip/communicator/plugin/securityconfig/SecurityConfigActivator.java
@@ -7,13 +7,13 @@ package net.java.sip.communicator.plugin.securityconfig;
 
 import java.util.*;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.credentialsstorage.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/plugin/securityconfig/masterpassword/SavedPasswordsDialog.java b/src/net/java/sip/communicator/plugin/securityconfig/masterpassword/SavedPasswordsDialog.java
index 4f8813e..79ecdc5 100644
--- a/src/net/java/sip/communicator/plugin/securityconfig/masterpassword/SavedPasswordsDialog.java
+++ b/src/net/java/sip/communicator/plugin/securityconfig/masterpassword/SavedPasswordsDialog.java
@@ -17,12 +17,12 @@ import javax.swing.event.*;
 import javax.swing.table.*;
 
 import net.java.sip.communicator.plugin.securityconfig.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.credentialsstorage.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 // disambiguation
 
diff --git a/src/net/java/sip/communicator/plugin/simpleaccreg/InitialAccountRegistrationFrame.java b/src/net/java/sip/communicator/plugin/simpleaccreg/InitialAccountRegistrationFrame.java
index a433ada..e83614f 100644
--- a/src/net/java/sip/communicator/plugin/simpleaccreg/InitialAccountRegistrationFrame.java
+++ b/src/net/java/sip/communicator/plugin/simpleaccreg/InitialAccountRegistrationFrame.java
@@ -15,13 +15,13 @@ import javax.imageio.*;
 import javax.swing.*;

 import javax.swing.text.*;

 

-import org.jitsi.service.configuration.*;

 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.util.*;

 import net.java.sip.communicator.util.swing.*;

 

+import org.jitsi.service.configuration.*;

 import org.osgi.framework.*;

 

 /**

diff --git a/src/net/java/sip/communicator/plugin/simpleaccreg/SimpleAccountRegistrationActivator.java b/src/net/java/sip/communicator/plugin/simpleaccreg/SimpleAccountRegistrationActivator.java
index 0d627e8..2be64a3 100644
--- a/src/net/java/sip/communicator/plugin/simpleaccreg/SimpleAccountRegistrationActivator.java
+++ b/src/net/java/sip/communicator/plugin/simpleaccreg/SimpleAccountRegistrationActivator.java
@@ -9,12 +9,12 @@ package net.java.sip.communicator.plugin.simpleaccreg;
 import java.awt.*;
 import java.util.*;
 
-import org.jitsi.service.configuration.*;
 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.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/CreateSip2SipAccountForm.java b/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/CreateSip2SipAccountForm.java
index 591f3c8..5af290e 100644
--- a/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/CreateSip2SipAccountForm.java
+++ b/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/CreateSip2SipAccountForm.java
@@ -14,13 +14,13 @@ import java.net.*;
 import javax.swing.*;
 import javax.swing.text.*;
 
-import org.json.*;
-
 import net.java.sip.communicator.plugin.ippiaccregwizz.*;
 import net.java.sip.communicator.plugin.sipaccregwizz.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.json.*;
+
 /**
  * @author Yana Stamcheva
  */
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccRegWizzActivator.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccRegWizzActivator.java
index 3caf867..83ee284 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccRegWizzActivator.java
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccRegWizzActivator.java
@@ -7,15 +7,15 @@ package net.java.sip.communicator.plugin.sipaccregwizz;
 
 import java.util.*;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.browserlauncher.*;
 import net.java.sip.communicator.service.certificate.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
+import org.osgi.framework.*;
+
 /**
  * Registers the <tt>SIPAccountRegistrationWizard</tt> in the UI Service.
  *
diff --git a/src/net/java/sip/communicator/plugin/skinmanager/BundleComparator.java b/src/net/java/sip/communicator/plugin/skinmanager/BundleComparator.java
index e9483e0..4e70ded 100644
--- a/src/net/java/sip/communicator/plugin/skinmanager/BundleComparator.java
+++ b/src/net/java/sip/communicator/plugin/skinmanager/BundleComparator.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.plugin.skinmanager;
 
 import java.util.*;
+
 import org.osgi.framework.*;
 
 /**
diff --git a/src/net/java/sip/communicator/plugin/skinmanager/SkinManagerActivator.java b/src/net/java/sip/communicator/plugin/skinmanager/SkinManagerActivator.java
index a91b270..ac5d7c5 100644
--- a/src/net/java/sip/communicator/plugin/skinmanager/SkinManagerActivator.java
+++ b/src/net/java/sip/communicator/plugin/skinmanager/SkinManagerActivator.java
@@ -7,10 +7,10 @@ package net.java.sip.communicator.plugin.skinmanager;
 
 import java.util.*;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.osgi.framework.*;
 
 /**
diff --git a/src/net/java/sip/communicator/plugin/skinmanager/SkinManagerPanel.java b/src/net/java/sip/communicator/plugin/skinmanager/SkinManagerPanel.java
index 2b2dd8d..09faefc 100644
--- a/src/net/java/sip/communicator/plugin/skinmanager/SkinManagerPanel.java
+++ b/src/net/java/sip/communicator/plugin/skinmanager/SkinManagerPanel.java
@@ -10,6 +10,7 @@ import java.awt.*;
 import java.awt.event.*;
 
 import javax.swing.*;
+
 import net.java.sip.communicator.util.swing.*;
 
 import org.osgi.framework.*;
diff --git a/src/net/java/sip/communicator/plugin/skinmanager/SkinSelectorRenderer.java b/src/net/java/sip/communicator/plugin/skinmanager/SkinSelectorRenderer.java
index d01fb89..a51cc8f 100644
--- a/src/net/java/sip/communicator/plugin/skinmanager/SkinSelectorRenderer.java
+++ b/src/net/java/sip/communicator/plugin/skinmanager/SkinSelectorRenderer.java
@@ -13,7 +13,7 @@ import java.util.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.util.swing.TransparentPanel;
+import net.java.sip.communicator.util.swing.*;
 
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/plugin/skinresourcepack/SkinResourcePack.java b/src/net/java/sip/communicator/plugin/skinresourcepack/SkinResourcePack.java
index e2e5ea6..2dfcc6d 100644
--- a/src/net/java/sip/communicator/plugin/skinresourcepack/SkinResourcePack.java
+++ b/src/net/java/sip/communicator/plugin/skinresourcepack/SkinResourcePack.java
@@ -9,11 +9,11 @@ package net.java.sip.communicator.plugin.skinresourcepack;
 import java.net.*;
 import java.util.*;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * The skin resource pack.
  *
diff --git a/src/net/java/sip/communicator/plugin/spellcheck/CheckerToggleButton.java b/src/net/java/sip/communicator/plugin/spellcheck/CheckerToggleButton.java
index f8d6f0f..f465da6 100644
--- a/src/net/java/sip/communicator/plugin/spellcheck/CheckerToggleButton.java
+++ b/src/net/java/sip/communicator/plugin/spellcheck/CheckerToggleButton.java
@@ -11,7 +11,7 @@ import javax.swing.*;
 
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.gui.*;
-import net.java.sip.communicator.service.protocol.Contact;
+import net.java.sip.communicator.service.protocol.*;
 
 /**
  * Toggle-able button that sets the spell checker to be either enabled or
diff --git a/src/net/java/sip/communicator/plugin/spellcheck/DocUnderliner.java b/src/net/java/sip/communicator/plugin/spellcheck/DocUnderliner.java
index 860333b..2ee7eec 100644
--- a/src/net/java/sip/communicator/plugin/spellcheck/DocUnderliner.java
+++ b/src/net/java/sip/communicator/plugin/spellcheck/DocUnderliner.java
@@ -11,7 +11,7 @@ import javax.swing.*;
 import javax.swing.event.*;
 import javax.swing.text.*;
 
-import net.java.sip.communicator.util.Logger;
+import net.java.sip.communicator.util.*;
 
 /**
  * Notifies subclasses when words are changed and lets them decide if text
diff --git a/src/net/java/sip/communicator/plugin/spellcheck/LanguageMenuBar.java b/src/net/java/sip/communicator/plugin/spellcheck/LanguageMenuBar.java
index 9ec1f68..221e91c 100644
--- a/src/net/java/sip/communicator/plugin/spellcheck/LanguageMenuBar.java
+++ b/src/net/java/sip/communicator/plugin/spellcheck/LanguageMenuBar.java
@@ -6,9 +6,8 @@
 package net.java.sip.communicator.plugin.spellcheck;
 
 import java.awt.*;
-import java.awt.image.*;
 import java.awt.event.*;
-
+import java.awt.image.*;
 import java.io.*;
 import java.util.*;
 
@@ -20,7 +19,7 @@ import net.java.sip.communicator.plugin.spellcheck.Parameters.Locale;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
-import net.java.sip.communicator.service.protocol.Contact;
+import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.swing.*;
 import net.java.sip.communicator.util.swing.SwingWorker;
diff --git a/src/net/java/sip/communicator/plugin/spellcheck/Parameters.java b/src/net/java/sip/communicator/plugin/spellcheck/Parameters.java
index 10d78f4..f0859d4 100644
--- a/src/net/java/sip/communicator/plugin/spellcheck/Parameters.java
+++ b/src/net/java/sip/communicator/plugin/spellcheck/Parameters.java
@@ -7,15 +7,14 @@ package net.java.sip.communicator.plugin.spellcheck;
 
 import java.io.*;
 import java.net.*;
-import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.*;
 
 import javax.xml.parsers.*;
 
-import net.java.sip.communicator.util.Logger;
+import net.java.sip.communicator.util.*;
 
 import org.w3c.dom.*;
-import org.xml.sax.SAXException;
+import org.xml.sax.*;
 
 /**
  * Information provided via the spellchecer's xml parameters.
diff --git a/src/net/java/sip/communicator/plugin/spellcheck/Word.java b/src/net/java/sip/communicator/plugin/spellcheck/Word.java
index 9c87c03..71fff79 100644
--- a/src/net/java/sip/communicator/plugin/spellcheck/Word.java
+++ b/src/net/java/sip/communicator/plugin/spellcheck/Word.java
@@ -5,7 +5,7 @@
  */
 package net.java.sip.communicator.plugin.spellcheck;
 
-import java.text.BreakIterator;
+import java.text.*;
 
 /**
  * Immutable representation of a word in the context of a document, bundling the
diff --git a/src/net/java/sip/communicator/plugin/sshaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/sshaccregwizz/FirstWizardPage.java
index 6530ceb..0f3e2a3 100644
--- a/src/net/java/sip/communicator/plugin/sshaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/sshaccregwizz/FirstWizardPage.java
@@ -14,7 +14,7 @@ package net.java.sip.communicator.plugin.sshaccregwizz;
 
 import java.awt.*;
 import java.awt.event.*;
-import java.io.File;
+import java.io.*;
 
 import javax.swing.*;
 import javax.swing.event.*;
diff --git a/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccRegWizzActivator.java b/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccRegWizzActivator.java
index c387b91..e317fc7 100644
--- a/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccRegWizzActivator.java
+++ b/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccRegWizzActivator.java
@@ -14,12 +14,12 @@ package net.java.sip.communicator.plugin.sshaccregwizz;
 
 import java.util.*;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * Registers the <tt>SSHAccountRegistrationWizard</tt> in the UI Service.
  *
diff --git a/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java
index 79e403d..73a46df 100644
--- a/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java
@@ -17,13 +17,13 @@ package net.java.sip.communicator.plugin.sshaccregwizz;
 import java.awt.*;
 import java.util.*;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.impl.protocol.ssh.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * The <tt>SSHAccountRegistrationWizard</tt> is an implementation of the
  * <tt>AccountRegistrationWizard</tt> for the SSH protocol. It allows
diff --git a/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardMenuItem.java b/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardMenuItem.java
index de1872d..b485b08 100644
--- a/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardMenuItem.java
+++ b/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardMenuItem.java
@@ -7,8 +7,8 @@
 package net.java.sip.communicator.plugin.whiteboard;
 
 import java.awt.event.*;
-
 import java.util.*;
+
 import javax.swing.*;
 
 import net.java.sip.communicator.service.contactlist.*;
diff --git a/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFileFilter.java b/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFileFilter.java
index 23e330c..42431d3 100644
--- a/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFileFilter.java
+++ b/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFileFilter.java
@@ -7,7 +7,7 @@
 
 package net.java.sip.communicator.plugin.whiteboard.gui;
 
-import java.io.File;
+import java.io.*;
 
 import net.java.sip.communicator.util.swing.*;
 
diff --git a/src/net/java/sip/communicator/plugin/whiteboard/gui/whiteboardshapes/WhiteboardShapeImage.java b/src/net/java/sip/communicator/plugin/whiteboard/gui/whiteboardshapes/WhiteboardShapeImage.java
index 6f1ef0d..76b9ddd 100644
--- a/src/net/java/sip/communicator/plugin/whiteboard/gui/whiteboardshapes/WhiteboardShapeImage.java
+++ b/src/net/java/sip/communicator/plugin/whiteboard/gui/whiteboardshapes/WhiteboardShapeImage.java
@@ -8,12 +8,13 @@
 package net.java.sip.communicator.plugin.whiteboard.gui.whiteboardshapes;
 
 import java.awt.*;
-import java.util.*;
-
-import javax.swing.ImageIcon;
-import net.java.sip.communicator.service.protocol.WhiteboardPoint;
 import java.awt.geom.*;
+import java.util.*;
 import java.util.List;
+
+import javax.swing.*;
+
+import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.whiteboardobjects.*;
 
 /**
diff --git a/src/net/java/sip/communicator/plugin/whiteboard/gui/whiteboardshapes/WhiteboardShapePolyLine.java b/src/net/java/sip/communicator/plugin/whiteboard/gui/whiteboardshapes/WhiteboardShapePolyLine.java
index 6445427..2e22f77 100644
--- a/src/net/java/sip/communicator/plugin/whiteboard/gui/whiteboardshapes/WhiteboardShapePolyLine.java
+++ b/src/net/java/sip/communicator/plugin/whiteboard/gui/whiteboardshapes/WhiteboardShapePolyLine.java
@@ -7,15 +7,12 @@
 
 package net.java.sip.communicator.plugin.whiteboard.gui.whiteboardshapes;
 
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.GeneralPath;
-import java.awt.geom.Point2D;
-import java.util.ArrayList;
+import java.awt.*;
+import java.awt.geom.*;
+import java.util.*;
 import java.util.List;
-import net.java.sip.communicator.service.protocol.WhiteboardPoint;
+
+import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.whiteboardobjects.*;
 
 /**
diff --git a/src/net/java/sip/communicator/plugin/whiteboard/gui/whiteboardshapes/WhiteboardShapePolygon.java b/src/net/java/sip/communicator/plugin/whiteboard/gui/whiteboardshapes/WhiteboardShapePolygon.java
index c205c2d..f8ac184 100644
--- a/src/net/java/sip/communicator/plugin/whiteboard/gui/whiteboardshapes/WhiteboardShapePolygon.java
+++ b/src/net/java/sip/communicator/plugin/whiteboard/gui/whiteboardshapes/WhiteboardShapePolygon.java
@@ -7,15 +7,12 @@
 
 package net.java.sip.communicator.plugin.whiteboard.gui.whiteboardshapes;
 
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.GeneralPath;
-import java.awt.geom.Point2D;
-import java.util.ArrayList;
+import java.awt.*;
+import java.awt.geom.*;
+import java.util.*;
 import java.util.List;
-import net.java.sip.communicator.service.protocol.WhiteboardPoint;
+
+import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.whiteboardobjects.*;
 
 /**
diff --git a/src/net/java/sip/communicator/plugin/whiteboard/gui/whiteboardshapes/WhiteboardShapeText.java b/src/net/java/sip/communicator/plugin/whiteboard/gui/whiteboardshapes/WhiteboardShapeText.java
index c8ca337..6169088 100644
--- a/src/net/java/sip/communicator/plugin/whiteboard/gui/whiteboardshapes/WhiteboardShapeText.java
+++ b/src/net/java/sip/communicator/plugin/whiteboard/gui/whiteboardshapes/WhiteboardShapeText.java
@@ -7,13 +7,12 @@
 
 package net.java.sip.communicator.plugin.whiteboard.gui.whiteboardshapes;
 
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Graphics2D;
+import java.awt.*;
 import java.awt.geom.*;
 import java.util.*;
-import net.java.sip.communicator.service.protocol.WhiteboardPoint;
+import java.util.List;
+
+import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.whiteboardobjects.*;
 
 
diff --git a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccRegWizzActivator.java b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccRegWizzActivator.java
index b0b91aa..c6e21aa 100644
--- a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccRegWizzActivator.java
+++ b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccRegWizzActivator.java
@@ -8,11 +8,12 @@ package net.java.sip.communicator.plugin.zeroconfaccregwizz;
 
 import java.util.*;
 
-import org.osgi.framework.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * Registers the <tt>ZeroconfAccountRegistrationWizard</tt> in the UI Service.
  * 
diff --git a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java
index 3b8f676..71b5da6 100644
--- a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java
@@ -9,12 +9,12 @@ package net.java.sip.communicator.plugin.zeroconfaccregwizz;
 import java.awt.*;
 import java.util.*;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * The <tt>ZeroconfAccountRegistrationWizard</tt> is an implementation of the
  * <tt>AccountRegistrationWizard</tt> for the Zeroconf protocol. It allows
diff --git a/src/net/java/sip/communicator/service/certificate/CertificateService.java b/src/net/java/sip/communicator/service/certificate/CertificateService.java
index 795fdfa..77bd91b 100644
--- a/src/net/java/sip/communicator/service/certificate/CertificateService.java
+++ b/src/net/java/sip/communicator/service/certificate/CertificateService.java
@@ -6,8 +6,9 @@
  */

 package net.java.sip.communicator.service.certificate;

 

-import java.security.GeneralSecurityException;

+import java.security.*;

 import java.security.cert.*;

+import java.security.cert.Certificate;

 import java.util.*;

 

 import javax.net.ssl.*;

diff --git a/src/net/java/sip/communicator/service/filehistory/FileRecord.java b/src/net/java/sip/communicator/service/filehistory/FileRecord.java
index 449c1b7..815a006 100644
--- a/src/net/java/sip/communicator/service/filehistory/FileRecord.java
+++ b/src/net/java/sip/communicator/service/filehistory/FileRecord.java
@@ -7,7 +7,8 @@
 package net.java.sip.communicator.service.filehistory;
 
 import java.io.*;
-import net.java.sip.communicator.service.protocol.Contact;
+
+import net.java.sip.communicator.service.protocol.*;
 
 /**
  * Structure used for encapsulating data when writing or reading
diff --git a/src/net/java/sip/communicator/service/gui/UIService.java b/src/net/java/sip/communicator/service/gui/UIService.java
index f2a7b3b..45f4dfd 100644
--- a/src/net/java/sip/communicator/service/gui/UIService.java
+++ b/src/net/java/sip/communicator/service/gui/UIService.java
@@ -11,9 +11,9 @@ import java.awt.event.*;
 import java.util.*;
 import java.util.List;
 
-import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.gui.event.*;
+import net.java.sip.communicator.service.protocol.*;
 
 /**
  * The <tt>UIService</tt> offers generic access to the graphical user interface
diff --git a/src/net/java/sip/communicator/service/gui/event/ChatListener.java b/src/net/java/sip/communicator/service/gui/event/ChatListener.java
index 85b2909..cb04e41 100644
--- a/src/net/java/sip/communicator/service/gui/event/ChatListener.java
+++ b/src/net/java/sip/communicator/service/gui/event/ChatListener.java
@@ -6,7 +6,7 @@
  */
 package net.java.sip.communicator.service.gui.event;
 
-import net.java.sip.communicator.service.gui.Chat;
+import net.java.sip.communicator.service.gui.*;
 
 /**
  * Listens to the creation and closing of <tt>Chat</tt>s.
diff --git a/src/net/java/sip/communicator/service/gui/event/ChatMenuListener.java b/src/net/java/sip/communicator/service/gui/event/ChatMenuListener.java
index 916d2aa..39b1fc9 100644
--- a/src/net/java/sip/communicator/service/gui/event/ChatMenuListener.java
+++ b/src/net/java/sip/communicator/service/gui/event/ChatMenuListener.java
@@ -7,11 +7,11 @@
 package net.java.sip.communicator.service.gui.event;
 
 import java.awt.event.*;
-import java.util.List;
+import java.util.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.service.gui.Chat;
+import net.java.sip.communicator.service.gui.*;
 
 /**
  * Listens for the chat's right click menu becoming visible so menu items can
diff --git a/src/net/java/sip/communicator/service/history/HistoryReader.java b/src/net/java/sip/communicator/service/history/HistoryReader.java
index 5bad480..3a42f8a 100644
--- a/src/net/java/sip/communicator/service/history/HistoryReader.java
+++ b/src/net/java/sip/communicator/service/history/HistoryReader.java
@@ -7,8 +7,9 @@
 package net.java.sip.communicator.service.history;
 
 import java.util.*;
+
 import net.java.sip.communicator.service.history.event.*;
-import net.java.sip.communicator.service.history.records.HistoryRecord;
+import net.java.sip.communicator.service.history.records.*;
 
 /**
  * Used to serach over the history records
diff --git a/src/net/java/sip/communicator/service/httputil/HttpUtilActivator.java b/src/net/java/sip/communicator/service/httputil/HttpUtilActivator.java
index 9c923ec..325aab5 100644
--- a/src/net/java/sip/communicator/service/httputil/HttpUtilActivator.java
+++ b/src/net/java/sip/communicator/service/httputil/HttpUtilActivator.java
@@ -1,11 +1,11 @@
 package net.java.sip.communicator.service.httputil;
 
 import net.java.sip.communicator.service.certificate.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.credentialsstorage.*;
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/service/httputil/HttpUtils.java b/src/net/java/sip/communicator/service/httputil/HttpUtils.java
index 2b92f3e..b4488d1 100644
--- a/src/net/java/sip/communicator/service/httputil/HttpUtils.java
+++ b/src/net/java/sip/communicator/service/httputil/HttpUtils.java
@@ -6,8 +6,16 @@
  */
 package net.java.sip.communicator.service.httputil;
 
+import java.io.*;
+import java.net.*;
+import java.security.*;
+import java.util.*;
+
+import javax.net.ssl.*;
+
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.swing.*;
+
 import org.apache.http.*;
 import org.apache.http.Header;
 import org.apache.http.auth.*;
@@ -27,12 +35,6 @@ import org.apache.http.params.*;
 import org.apache.http.protocol.*;
 import org.apache.http.util.*;
 
-import javax.net.ssl.*;
-import java.io.*;
-import java.net.*;
-import java.security.*;
-import java.util.*;
-
 /**
  * Common http utils querying http locations, handling redirects, self-signed
  * certificates, host verify on certificates, password protection and storing
diff --git a/src/net/java/sip/communicator/service/keybindings/GlobalKeybindingSet.java b/src/net/java/sip/communicator/service/keybindings/GlobalKeybindingSet.java
index 25d2668..9432201 100644
--- a/src/net/java/sip/communicator/service/keybindings/GlobalKeybindingSet.java
+++ b/src/net/java/sip/communicator/service/keybindings/GlobalKeybindingSet.java
@@ -6,9 +6,10 @@
  */
 package net.java.sip.communicator.service.keybindings;
 
-import java.util.*;
-import java.util.List; //disambiguation
 import java.awt.*;
+import java.util.*;
+import java.util.List;
+//disambiguation
 
 /**
  * Global keybinding set interface.
diff --git a/src/net/java/sip/communicator/service/keybindings/Persistence.java b/src/net/java/sip/communicator/service/keybindings/Persistence.java
index f4990ed..b47d170 100644
--- a/src/net/java/sip/communicator/service/keybindings/Persistence.java
+++ b/src/net/java/sip/communicator/service/keybindings/Persistence.java
@@ -1,11 +1,10 @@
 package net.java.sip.communicator.service.keybindings;
 
 import java.io.*;
+import java.text.*;
 import java.util.*;
-import java.text.ParseException;
 
-import javax.swing.InputMap;
-import javax.swing.KeyStroke;
+import javax.swing.*;
 
 /**
  * Convenience methods providing a quick means of loading and saving
diff --git a/src/net/java/sip/communicator/service/ldap/LdapService.java b/src/net/java/sip/communicator/service/ldap/LdapService.java
index 9986666..3ba9012 100644
--- a/src/net/java/sip/communicator/service/ldap/LdapService.java
+++ b/src/net/java/sip/communicator/service/ldap/LdapService.java
@@ -6,7 +6,7 @@
  */
 package net.java.sip.communicator.service.ldap;
 
-import net.java.sip.communicator.service.contactsource.ContactSourceService;
+import net.java.sip.communicator.service.contactsource.*;
 
 /**
  * The Ldap Service allows other modules to query an LDAP server
diff --git a/src/net/java/sip/communicator/service/metahistory/MetaHistoryService.java b/src/net/java/sip/communicator/service/metahistory/MetaHistoryService.java
index d30257c..08ccf0b 100644
--- a/src/net/java/sip/communicator/service/metahistory/MetaHistoryService.java
+++ b/src/net/java/sip/communicator/service/metahistory/MetaHistoryService.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.service.metahistory;
 
 import java.util.*;
+
 import net.java.sip.communicator.service.history.event.*;
 
 /**
diff --git a/src/net/java/sip/communicator/service/msghistory/MessageHistoryService.java b/src/net/java/sip/communicator/service/msghistory/MessageHistoryService.java
index fc1d1af..cc5b195 100644
--- a/src/net/java/sip/communicator/service/msghistory/MessageHistoryService.java
+++ b/src/net/java/sip/communicator/service/msghistory/MessageHistoryService.java
@@ -8,9 +8,9 @@ package net.java.sip.communicator.service.msghistory;
 
 import java.util.*;
 
-import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.msghistory.event.*;
+import net.java.sip.communicator.service.protocol.*;
 
 /**
  * The Message History Service stores messages exchanged through the various protocols
diff --git a/src/net/java/sip/communicator/service/netaddr/NetworkAddressManagerService.java b/src/net/java/sip/communicator/service/netaddr/NetworkAddressManagerService.java
index 21e5de5..4ea70bf 100644
--- a/src/net/java/sip/communicator/service/netaddr/NetworkAddressManagerService.java
+++ b/src/net/java/sip/communicator/service/netaddr/NetworkAddressManagerService.java
@@ -6,14 +6,14 @@
  */
 package net.java.sip.communicator.service.netaddr;
 
-import java.net.*;
 import java.io.*;
+import java.net.*;
+
+import net.java.sip.communicator.service.netaddr.event.*;
 
 import org.ice4j.ice.*;
 import org.ice4j.ice.harvest.*;
 
-import net.java.sip.communicator.service.netaddr.event.*;
-
 /**
  * The NetworkAddressManagerService takes care of problems such as
  * @author Emil Ivov
diff --git a/src/net/java/sip/communicator/service/notification/CommandNotificationHandler.java b/src/net/java/sip/communicator/service/notification/CommandNotificationHandler.java
index 095fd6d..8540166 100644
--- a/src/net/java/sip/communicator/service/notification/CommandNotificationHandler.java
+++ b/src/net/java/sip/communicator/service/notification/CommandNotificationHandler.java
@@ -6,7 +6,7 @@
  */
 package net.java.sip.communicator.service.notification;
 
-import java.util.Map;
+import java.util.*;
 
 /**
  * The <tt>CommandNotificationHandler</tt> interface is meant to be implemented
diff --git a/src/net/java/sip/communicator/service/notification/NotificationData.java b/src/net/java/sip/communicator/service/notification/NotificationData.java
index 4ff59fe..d88b6e6 100644
--- a/src/net/java/sip/communicator/service/notification/NotificationData.java
+++ b/src/net/java/sip/communicator/service/notification/NotificationData.java
@@ -6,7 +6,7 @@
  */

 package net.java.sip.communicator.service.notification;

 

-import java.util.Map;

+import java.util.*;

 

 /**

  * Object to cache fired notifications before all handler implementations are

diff --git a/src/net/java/sip/communicator/service/notification/NotificationServiceActivator.java b/src/net/java/sip/communicator/service/notification/NotificationServiceActivator.java
index a2f6932..8826c9d 100644
--- a/src/net/java/sip/communicator/service/notification/NotificationServiceActivator.java
+++ b/src/net/java/sip/communicator/service/notification/NotificationServiceActivator.java
@@ -6,9 +6,9 @@
  */
 package net.java.sip.communicator.service.notification;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.osgi.framework.*;
 
 /**
diff --git a/src/net/java/sip/communicator/service/notification/NotificationServiceImpl.java b/src/net/java/sip/communicator/service/notification/NotificationServiceImpl.java
index b16e8e5..a740a9e 100644
--- a/src/net/java/sip/communicator/service/notification/NotificationServiceImpl.java
+++ b/src/net/java/sip/communicator/service/notification/NotificationServiceImpl.java
@@ -6,14 +6,23 @@
  */
 package net.java.sip.communicator.service.notification;
 
+import static net.java.sip.communicator.service.notification.NotificationAction.ACTION_COMMAND;
+import static net.java.sip.communicator.service.notification.NotificationAction.ACTION_LOG_MESSAGE;
+import static net.java.sip.communicator.service.notification.NotificationAction.ACTION_POPUP_MESSAGE;
+import static net.java.sip.communicator.service.notification.NotificationAction.ACTION_SOUND;
+import static net.java.sip.communicator.service.notification.NotificationAction.NUM_ACTIONS;
+import static net.java.sip.communicator.service.notification.event.NotificationActionTypeEvent.ACTION_ADDED;
+import static net.java.sip.communicator.service.notification.event.NotificationActionTypeEvent.ACTION_CHANGED;
+import static net.java.sip.communicator.service.notification.event.NotificationActionTypeEvent.ACTION_REMOVED;
+import static net.java.sip.communicator.service.notification.event.NotificationEventTypeEvent.EVENT_TYPE_ADDED;
+import static net.java.sip.communicator.service.notification.event.NotificationEventTypeEvent.EVENT_TYPE_REMOVED;
+
 import java.util.*;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.notification.event.*;
 import net.java.sip.communicator.util.*;
-import static net.java.sip.communicator.service.notification.NotificationAction.*;
-import static net.java.sip.communicator.service.notification.event.NotificationActionTypeEvent.*;
-import static net.java.sip.communicator.service.notification.event.NotificationEventTypeEvent.*;
+
+import org.jitsi.service.configuration.*;
 
 /**
  * The implementation of the <tt>NotificationService</tt>.
diff --git a/src/net/java/sip/communicator/service/notification/event/NotificationActionTypeEvent.java b/src/net/java/sip/communicator/service/notification/event/NotificationActionTypeEvent.java
index 8773537..19816be 100644
--- a/src/net/java/sip/communicator/service/notification/event/NotificationActionTypeEvent.java
+++ b/src/net/java/sip/communicator/service/notification/event/NotificationActionTypeEvent.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.service.notification.event;
 
 import java.util.*;
+
 import net.java.sip.communicator.service.notification.*;
 
 /**
diff --git a/src/net/java/sip/communicator/service/notification/event/NotificationEventTypeEvent.java b/src/net/java/sip/communicator/service/notification/event/NotificationEventTypeEvent.java
index 531a2aa..ee695ff 100644
--- a/src/net/java/sip/communicator/service/notification/event/NotificationEventTypeEvent.java
+++ b/src/net/java/sip/communicator/service/notification/event/NotificationEventTypeEvent.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.service.notification.event;
 
 import java.util.*;
+
 import net.java.sip.communicator.service.notification.*;
 
 /**
diff --git a/src/net/java/sip/communicator/service/protocol/AbstractOperationSetAvatar.java b/src/net/java/sip/communicator/service/protocol/AbstractOperationSetAvatar.java
index 7a141a3..99fbc00 100644
--- a/src/net/java/sip/communicator/service/protocol/AbstractOperationSetAvatar.java
+++ b/src/net/java/sip/communicator/service/protocol/AbstractOperationSetAvatar.java
@@ -7,9 +7,10 @@ package net.java.sip.communicator.service.protocol;
 
 import java.util.*;
 
-import net.java.sip.communicator.service.protocol.ServerStoredDetails.*;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.GenericDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.ImageDetail;
 import net.java.sip.communicator.service.protocol.event.*;
-import net.java.sip.communicator.util.Logger;
+import net.java.sip.communicator.util.*;
 
 /**
  * Represents a default implementation of {@link OperationSetAvatar} in order to
diff --git a/src/net/java/sip/communicator/service/protocol/AbstractOperationSetBasicAutoAnswer.java b/src/net/java/sip/communicator/service/protocol/AbstractOperationSetBasicAutoAnswer.java
index f90e4b1..baafeb2 100644
--- a/src/net/java/sip/communicator/service/protocol/AbstractOperationSetBasicAutoAnswer.java
+++ b/src/net/java/sip/communicator/service/protocol/AbstractOperationSetBasicAutoAnswer.java
@@ -6,11 +6,11 @@
  */
 package net.java.sip.communicator.service.protocol;
 
+import java.util.*;
+
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 
-import java.util.*;
-
 /**
  * An Abstract Operation Set defining option to unconditionally auto answer
  * incoming calls.
diff --git a/src/net/java/sip/communicator/service/protocol/AbstractOperationSetPersistentPresence.java b/src/net/java/sip/communicator/service/protocol/AbstractOperationSetPersistentPresence.java
index 4b4a195..3bb3f05 100644
--- a/src/net/java/sip/communicator/service/protocol/AbstractOperationSetPersistentPresence.java
+++ b/src/net/java/sip/communicator/service/protocol/AbstractOperationSetPersistentPresence.java
@@ -5,7 +5,7 @@
  */
 package net.java.sip.communicator.service.protocol;
 
-import java.beans.PropertyChangeEvent;
+import java.beans.*;
 import java.util.*;
 
 import net.java.sip.communicator.service.protocol.event.*;
diff --git a/src/net/java/sip/communicator/service/protocol/AbstractOperationSetServerStoredAccountInfo.java b/src/net/java/sip/communicator/service/protocol/AbstractOperationSetServerStoredAccountInfo.java
index a1dad66..9b5ee1b 100644
--- a/src/net/java/sip/communicator/service/protocol/AbstractOperationSetServerStoredAccountInfo.java
+++ b/src/net/java/sip/communicator/service/protocol/AbstractOperationSetServerStoredAccountInfo.java
@@ -1,10 +1,10 @@
 package net.java.sip.communicator.service.protocol;
 
+import java.util.*;
+
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 
-import java.util.*;
-
 /**
  * Represents a default implementation of
  * {@link OperationSetServerStoredAccountInfo} in order to make it easier for
diff --git a/src/net/java/sip/communicator/service/protocol/AccountInfoUtils.java b/src/net/java/sip/communicator/service/protocol/AccountInfoUtils.java
index ae86d8e..dc97df3 100644
--- a/src/net/java/sip/communicator/service/protocol/AccountInfoUtils.java
+++ b/src/net/java/sip/communicator/service/protocol/AccountInfoUtils.java
@@ -8,7 +8,16 @@ package net.java.sip.communicator.service.protocol;
 
 import java.util.*;
 
-import net.java.sip.communicator.service.protocol.ServerStoredDetails.*;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.AddressDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.BirthDateDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.DisplayNameDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.EmailAddressDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.FirstNameDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.GenderDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.GenericDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.ImageDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.LastNameDetail;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.WorkAddressDetail;
 
 /**
  * Utility class that would give to interested parties an easy access to some of
diff --git a/src/net/java/sip/communicator/service/protocol/AdHocChatRoom.java b/src/net/java/sip/communicator/service/protocol/AdHocChatRoom.java
index 23b829a..61be6ea 100644
--- a/src/net/java/sip/communicator/service/protocol/AdHocChatRoom.java
+++ b/src/net/java/sip/communicator/service/protocol/AdHocChatRoom.java
@@ -6,7 +6,7 @@
  */
 package net.java.sip.communicator.service.protocol;
 
-import java.util.List;
+import java.util.*;
 
 import net.java.sip.communicator.service.protocol.event.*;
 
diff --git a/src/net/java/sip/communicator/service/protocol/OperationSetAvatar.java b/src/net/java/sip/communicator/service/protocol/OperationSetAvatar.java
index 6c629dc..f324167 100644
--- a/src/net/java/sip/communicator/service/protocol/OperationSetAvatar.java
+++ b/src/net/java/sip/communicator/service/protocol/OperationSetAvatar.java
@@ -6,7 +6,7 @@
  */
 package net.java.sip.communicator.service.protocol;
 
-import net.java.sip.communicator.service.protocol.event.AvatarListener;
+import net.java.sip.communicator.service.protocol.event.*;
 
 /**
  * This interface is an extension of the operation set, meant to be implemented
diff --git a/src/net/java/sip/communicator/service/protocol/OperationSetDesktopSharingClient.java b/src/net/java/sip/communicator/service/protocol/OperationSetDesktopSharingClient.java
index ece1d8b..f3ed7d8 100644
--- a/src/net/java/sip/communicator/service/protocol/OperationSetDesktopSharingClient.java
+++ b/src/net/java/sip/communicator/service/protocol/OperationSetDesktopSharingClient.java
@@ -9,7 +9,7 @@ package net.java.sip.communicator.service.protocol;
 import java.awt.*;
 import java.awt.event.*;
 
-import net.java.sip.communicator.service.protocol.event.RemoteControlListener;
+import net.java.sip.communicator.service.protocol.event.*;
 
 /**
  * Represents an <tt>OperationSet</tt> giving access to desktop sharing
diff --git a/src/net/java/sip/communicator/service/protocol/OperationSetServerStoredAccountInfo.java b/src/net/java/sip/communicator/service/protocol/OperationSetServerStoredAccountInfo.java
index 73b9eed..3b859c6 100644
--- a/src/net/java/sip/communicator/service/protocol/OperationSetServerStoredAccountInfo.java
+++ b/src/net/java/sip/communicator/service/protocol/OperationSetServerStoredAccountInfo.java
@@ -8,7 +8,7 @@ package net.java.sip.communicator.service.protocol;
 
 import java.util.*;
 
-import net.java.sip.communicator.service.protocol.ServerStoredDetails.*;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.GenericDetail;
 import net.java.sip.communicator.service.protocol.event.*;
 
 /**
diff --git a/src/net/java/sip/communicator/service/protocol/OperationSetServerStoredContactInfo.java b/src/net/java/sip/communicator/service/protocol/OperationSetServerStoredContactInfo.java
index f890e48..53f85d9 100644
--- a/src/net/java/sip/communicator/service/protocol/OperationSetServerStoredContactInfo.java
+++ b/src/net/java/sip/communicator/service/protocol/OperationSetServerStoredContactInfo.java
@@ -8,7 +8,7 @@ package net.java.sip.communicator.service.protocol;
 
 import java.util.*;
 
-import net.java.sip.communicator.service.protocol.ServerStoredDetails.*;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.GenericDetail;
 
 /**
  * The User Info Operation set is a means of accessing detailed information of
diff --git a/src/net/java/sip/communicator/service/protocol/ProtocolProviderActivator.java b/src/net/java/sip/communicator/service/protocol/ProtocolProviderActivator.java
index 3918677..657c4f0 100644
--- a/src/net/java/sip/communicator/service/protocol/ProtocolProviderActivator.java
+++ b/src/net/java/sip/communicator/service/protocol/ProtocolProviderActivator.java
@@ -6,9 +6,9 @@
  */

 package net.java.sip.communicator.service.protocol;

 

-import org.jitsi.service.configuration.*;

 import net.java.sip.communicator.util.*;

 

+import org.jitsi.service.configuration.*;

 import org.jitsi.service.resources.*;

 import org.osgi.framework.*;

 

diff --git a/src/net/java/sip/communicator/service/protocol/ProtocolProviderFactory.java b/src/net/java/sip/communicator/service/protocol/ProtocolProviderFactory.java
index e3a1a45..489374b 100644
--- a/src/net/java/sip/communicator/service/protocol/ProtocolProviderFactory.java
+++ b/src/net/java/sip/communicator/service/protocol/ProtocolProviderFactory.java
@@ -9,10 +9,10 @@ package net.java.sip.communicator.service.protocol;
 import java.lang.reflect.*;
 import java.util.*;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.credentialsstorage.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.osgi.framework.*;
 
 /**
diff --git a/src/net/java/sip/communicator/service/protocol/SingleCallInProgressPolicy.java b/src/net/java/sip/communicator/service/protocol/SingleCallInProgressPolicy.java
index 9512fce..5206265 100644
--- a/src/net/java/sip/communicator/service/protocol/SingleCallInProgressPolicy.java
+++ b/src/net/java/sip/communicator/service/protocol/SingleCallInProgressPolicy.java
@@ -8,11 +8,11 @@ package net.java.sip.communicator.service.protocol;
 
 import java.util.*;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * Imposes the policy to have one call in progress i.e. to put existing calls on
  * hold when a new call enters in progress.
diff --git a/src/net/java/sip/communicator/service/protocol/StunServerDescriptor.java b/src/net/java/sip/communicator/service/protocol/StunServerDescriptor.java
index 9387de7..12832ca 100644
--- a/src/net/java/sip/communicator/service/protocol/StunServerDescriptor.java
+++ b/src/net/java/sip/communicator/service/protocol/StunServerDescriptor.java
@@ -6,10 +6,15 @@
  */
 package net.java.sip.communicator.service.protocol;
 
+import static net.java.sip.communicator.service.protocol.ProtocolProviderFactory.STUN_ADDRESS;
+import static net.java.sip.communicator.service.protocol.ProtocolProviderFactory.STUN_IS_TURN_SUPPORTED;
+import static net.java.sip.communicator.service.protocol.ProtocolProviderFactory.STUN_PASSWORD;
+import static net.java.sip.communicator.service.protocol.ProtocolProviderFactory.STUN_PORT;
+import static net.java.sip.communicator.service.protocol.ProtocolProviderFactory.STUN_USERNAME;
+
 import java.util.*;
 
 import net.java.sip.communicator.util.*;
-import static net.java.sip.communicator.service.protocol.ProtocolProviderFactory.*;
 
 /**
  * A <tt>StunServerDescriptor</tt> stores information necessary to create a
diff --git a/src/net/java/sip/communicator/service/protocol/event/AdHocChatRoomInvitationReceivedEvent.java b/src/net/java/sip/communicator/service/protocol/event/AdHocChatRoomInvitationReceivedEvent.java
index 19350aa..a29a243 100644
--- a/src/net/java/sip/communicator/service/protocol/event/AdHocChatRoomInvitationReceivedEvent.java
+++ b/src/net/java/sip/communicator/service/protocol/event/AdHocChatRoomInvitationReceivedEvent.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.service.protocol.event;
 
 import java.util.*;
+
 import net.java.sip.communicator.service.protocol.*;
 
 /**
diff --git a/src/net/java/sip/communicator/service/protocol/event/AdHocChatRoomInvitationRejectedEvent.java b/src/net/java/sip/communicator/service/protocol/event/AdHocChatRoomInvitationRejectedEvent.java
index e4060e8..ed7634a 100644
--- a/src/net/java/sip/communicator/service/protocol/event/AdHocChatRoomInvitationRejectedEvent.java
+++ b/src/net/java/sip/communicator/service/protocol/event/AdHocChatRoomInvitationRejectedEvent.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.service.protocol.event;
 
 import java.util.*;
+
 import net.java.sip.communicator.service.protocol.*;
 
 /**
diff --git a/src/net/java/sip/communicator/service/protocol/event/AdHocChatRoomParticipantPresenceChangeEvent.java b/src/net/java/sip/communicator/service/protocol/event/AdHocChatRoomParticipantPresenceChangeEvent.java
index bce2605..fcfdba5 100644
--- a/src/net/java/sip/communicator/service/protocol/event/AdHocChatRoomParticipantPresenceChangeEvent.java
+++ b/src/net/java/sip/communicator/service/protocol/event/AdHocChatRoomParticipantPresenceChangeEvent.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.service.protocol.event;
 
 import java.util.*;
+
 import net.java.sip.communicator.service.protocol.*;
 
 /**
diff --git a/src/net/java/sip/communicator/service/protocol/event/ChatRoomInvitationReceivedEvent.java b/src/net/java/sip/communicator/service/protocol/event/ChatRoomInvitationReceivedEvent.java
index 3f41102..c729ba1 100644
--- a/src/net/java/sip/communicator/service/protocol/event/ChatRoomInvitationReceivedEvent.java
+++ b/src/net/java/sip/communicator/service/protocol/event/ChatRoomInvitationReceivedEvent.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.service.protocol.event;
 
 import java.util.*;
+
 import net.java.sip.communicator.service.protocol.*;
 
 /**
diff --git a/src/net/java/sip/communicator/service/protocol/event/ChatRoomInvitationRejectedEvent.java b/src/net/java/sip/communicator/service/protocol/event/ChatRoomInvitationRejectedEvent.java
index e46f263..a30d4f5 100644
--- a/src/net/java/sip/communicator/service/protocol/event/ChatRoomInvitationRejectedEvent.java
+++ b/src/net/java/sip/communicator/service/protocol/event/ChatRoomInvitationRejectedEvent.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.service.protocol.event;
 
 import java.util.*;
+
 import net.java.sip.communicator.service.protocol.*;
 
 /**
diff --git a/src/net/java/sip/communicator/service/protocol/event/ChatRoomLocalUserRoleChangeEvent.java b/src/net/java/sip/communicator/service/protocol/event/ChatRoomLocalUserRoleChangeEvent.java
index f9e65b1..3073515 100644
--- a/src/net/java/sip/communicator/service/protocol/event/ChatRoomLocalUserRoleChangeEvent.java
+++ b/src/net/java/sip/communicator/service/protocol/event/ChatRoomLocalUserRoleChangeEvent.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.service.protocol.event;
 
 import java.util.*;
+
 import net.java.sip.communicator.service.protocol.*;
 
 /**
diff --git a/src/net/java/sip/communicator/service/protocol/event/ChatRoomMemberPresenceChangeEvent.java b/src/net/java/sip/communicator/service/protocol/event/ChatRoomMemberPresenceChangeEvent.java
index 9ca419e..46c1d74 100644
--- a/src/net/java/sip/communicator/service/protocol/event/ChatRoomMemberPresenceChangeEvent.java
+++ b/src/net/java/sip/communicator/service/protocol/event/ChatRoomMemberPresenceChangeEvent.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.service.protocol.event;
 
 import java.util.*;
+
 import net.java.sip.communicator.service.protocol.*;
 
 /**
diff --git a/src/net/java/sip/communicator/service/protocol/event/GenericEvent.java b/src/net/java/sip/communicator/service/protocol/event/GenericEvent.java
index 8678b23..3641ff6 100644
--- a/src/net/java/sip/communicator/service/protocol/event/GenericEvent.java
+++ b/src/net/java/sip/communicator/service/protocol/event/GenericEvent.java
@@ -6,10 +6,10 @@
  */
 package net.java.sip.communicator.service.protocol.event;
 
-import net.java.sip.communicator.service.protocol.*;
-
 import java.util.*;
 
+import net.java.sip.communicator.service.protocol.*;
+
 /**
  * <tt>GenericEvent</tt>s indicate reception of an new generic event.
  *
diff --git a/src/net/java/sip/communicator/service/protocol/event/LocalUserAdHocChatRoomPresenceChangeEvent.java b/src/net/java/sip/communicator/service/protocol/event/LocalUserAdHocChatRoomPresenceChangeEvent.java
index e36a850..8b2d787 100644
--- a/src/net/java/sip/communicator/service/protocol/event/LocalUserAdHocChatRoomPresenceChangeEvent.java
+++ b/src/net/java/sip/communicator/service/protocol/event/LocalUserAdHocChatRoomPresenceChangeEvent.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.service.protocol.event;
 
 import java.util.*;
+
 import net.java.sip.communicator.service.protocol.*;
 
 /**
diff --git a/src/net/java/sip/communicator/service/protocol/event/LocalUserChatRoomPresenceChangeEvent.java b/src/net/java/sip/communicator/service/protocol/event/LocalUserChatRoomPresenceChangeEvent.java
index 205a423..c150150 100644
--- a/src/net/java/sip/communicator/service/protocol/event/LocalUserChatRoomPresenceChangeEvent.java
+++ b/src/net/java/sip/communicator/service/protocol/event/LocalUserChatRoomPresenceChangeEvent.java
@@ -6,7 +6,8 @@
  */
 package net.java.sip.communicator.service.protocol.event;
 
-import java.util.EventObject;
+import java.util.*;
+
 import net.java.sip.communicator.service.protocol.*;
 
 /**
diff --git a/src/net/java/sip/communicator/service/protocol/event/MessageWaitingEvent.java b/src/net/java/sip/communicator/service/protocol/event/MessageWaitingEvent.java
index ff0e72d..b705cec 100644
--- a/src/net/java/sip/communicator/service/protocol/event/MessageWaitingEvent.java
+++ b/src/net/java/sip/communicator/service/protocol/event/MessageWaitingEvent.java
@@ -6,10 +6,10 @@
  */
 package net.java.sip.communicator.service.protocol.event;
 
-import net.java.sip.communicator.service.protocol.*;
-
 import java.util.*;
 
+import net.java.sip.communicator.service.protocol.*;
+
 /**
  * <tt>MessageWaitingEvent<tt> indicates a message waiting event
  * is received.
diff --git a/src/net/java/sip/communicator/service/protocol/event/ServerStoredDetailsChangeEvent.java b/src/net/java/sip/communicator/service/protocol/event/ServerStoredDetailsChangeEvent.java
index db2d7e9..bce6861 100644
--- a/src/net/java/sip/communicator/service/protocol/event/ServerStoredDetailsChangeEvent.java
+++ b/src/net/java/sip/communicator/service/protocol/event/ServerStoredDetailsChangeEvent.java
@@ -1,9 +1,9 @@
 package net.java.sip.communicator.service.protocol.event;
 
-import net.java.sip.communicator.service.protocol.*;
-
 import java.util.*;
 
+import net.java.sip.communicator.service.protocol.*;
+
 /**
  * Instances of this class represent a change in the server stored details
  * change that triggered them.
diff --git a/src/net/java/sip/communicator/service/protocol/event/WhiteboardInvitationReceivedEvent.java b/src/net/java/sip/communicator/service/protocol/event/WhiteboardInvitationReceivedEvent.java
index d92c7d3..0e3fed8 100644
--- a/src/net/java/sip/communicator/service/protocol/event/WhiteboardInvitationReceivedEvent.java
+++ b/src/net/java/sip/communicator/service/protocol/event/WhiteboardInvitationReceivedEvent.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.service.protocol.event;
 
 import java.util.*;
+
 import net.java.sip.communicator.service.protocol.*;
 
 /**
diff --git a/src/net/java/sip/communicator/service/protocol/event/WhiteboardInvitationRejectedEvent.java b/src/net/java/sip/communicator/service/protocol/event/WhiteboardInvitationRejectedEvent.java
index b7d0961..d2604a3 100644
--- a/src/net/java/sip/communicator/service/protocol/event/WhiteboardInvitationRejectedEvent.java
+++ b/src/net/java/sip/communicator/service/protocol/event/WhiteboardInvitationRejectedEvent.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.service.protocol.event;
 
 import java.util.*;
+
 import net.java.sip.communicator.service.protocol.*;
 
 /**
diff --git a/src/net/java/sip/communicator/service/protocol/event/WhiteboardSessionPresenceChangeEvent.java b/src/net/java/sip/communicator/service/protocol/event/WhiteboardSessionPresenceChangeEvent.java
index 960ce72..b780b1a 100644
--- a/src/net/java/sip/communicator/service/protocol/event/WhiteboardSessionPresenceChangeEvent.java
+++ b/src/net/java/sip/communicator/service/protocol/event/WhiteboardSessionPresenceChangeEvent.java
@@ -6,7 +6,8 @@
  */
 package net.java.sip.communicator.service.protocol.event;
 
-import java.util.EventObject;
+import java.util.*;
+
 import net.java.sip.communicator.service.protocol.*;
 
 /**
diff --git a/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectCircle.java b/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectCircle.java
index 8f3c7d6..cfd29ef 100644
--- a/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectCircle.java
+++ b/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectCircle.java
@@ -7,7 +7,7 @@
 
 package net.java.sip.communicator.service.protocol.whiteboardobjects;
 
-import net.java.sip.communicator.service.protocol.WhiteboardPoint;
+import net.java.sip.communicator.service.protocol.*;
 
 /**
  * Used to access the content of instant whiteboard objects that are sent or
diff --git a/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectEllipse.java b/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectEllipse.java
index 2aae1ef..bdf68fe 100644
--- a/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectEllipse.java
+++ b/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectEllipse.java
@@ -7,7 +7,7 @@
 
 package net.java.sip.communicator.service.protocol.whiteboardobjects;
 
-import net.java.sip.communicator.service.protocol.WhiteboardPoint;
+import net.java.sip.communicator.service.protocol.*;
 
 /**
  * Used to access the content of instant whiteboard objects that are sent or
diff --git a/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectImage.java b/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectImage.java
index 7a51fdd..5981499 100644
--- a/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectImage.java
+++ b/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectImage.java
@@ -7,7 +7,7 @@
 
 package net.java.sip.communicator.service.protocol.whiteboardobjects;
 
-import net.java.sip.communicator.service.protocol.WhiteboardPoint;
+import net.java.sip.communicator.service.protocol.*;
 
 /**
  * Used to access the content of instant whiteboard objects that are sent or
diff --git a/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectLine.java b/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectLine.java
index 8c3a4ed..110be95 100644
--- a/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectLine.java
+++ b/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectLine.java
@@ -7,7 +7,7 @@
 
 package net.java.sip.communicator.service.protocol.whiteboardobjects;
 
-import net.java.sip.communicator.service.protocol.WhiteboardPoint;
+import net.java.sip.communicator.service.protocol.*;
 
 /**
  * Used to access the content of instant whiteboard objects that are sent or
diff --git a/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectPath.java b/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectPath.java
index 97d2d76..4c84691 100644
--- a/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectPath.java
+++ b/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectPath.java
@@ -6,7 +6,7 @@
  */
 package net.java.sip.communicator.service.protocol.whiteboardobjects;
 
-import java.util.List;
+import java.util.*;
 
 import net.java.sip.communicator.service.protocol.*;
 
diff --git a/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectPolygon.java b/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectPolygon.java
index 5ab9bb6..6bd4ce1 100644
--- a/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectPolygon.java
+++ b/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectPolygon.java
@@ -6,7 +6,7 @@
  */
 package net.java.sip.communicator.service.protocol.whiteboardobjects;
 
-import java.util.List;
+import java.util.*;
 
 import net.java.sip.communicator.service.protocol.*;
 
diff --git a/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectRect.java b/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectRect.java
index e9e3dcb..f74f2c9 100644
--- a/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectRect.java
+++ b/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectRect.java
@@ -7,7 +7,7 @@
 
 package net.java.sip.communicator.service.protocol.whiteboardobjects;
 
-import net.java.sip.communicator.service.protocol.WhiteboardPoint;
+import net.java.sip.communicator.service.protocol.*;
 
 /**
  * Used to access the content of instant whiteboard objects that are sent or
diff --git a/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectText.java b/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectText.java
index 5d8cec5..fe290d2 100644
--- a/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectText.java
+++ b/src/net/java/sip/communicator/service/protocol/whiteboardobjects/WhiteboardObjectText.java
@@ -7,7 +7,7 @@
 
 package net.java.sip.communicator.service.protocol.whiteboardobjects;
 
-import net.java.sip.communicator.service.protocol.WhiteboardPoint;
+import net.java.sip.communicator.service.protocol.*;
 
 /**
  * Used to access the content of instant whiteboard objects that are sent or
diff --git a/src/net/java/sip/communicator/service/sysactivity/SystemActivityChangeListener.java b/src/net/java/sip/communicator/service/sysactivity/SystemActivityChangeListener.java
index b2d8481..6ecb760 100644
--- a/src/net/java/sip/communicator/service/sysactivity/SystemActivityChangeListener.java
+++ b/src/net/java/sip/communicator/service/sysactivity/SystemActivityChangeListener.java
@@ -6,10 +6,10 @@
  */

 package net.java.sip.communicator.service.sysactivity;

 

-import net.java.sip.communicator.service.sysactivity.event.*;

-

 import java.util.*;

 

+import net.java.sip.communicator.service.sysactivity.event.*;

+

 /**

  * The <tt>SystemActivityChangeListener</tt> is notified any time an event

  * in the operating system occurs.

diff --git a/src/net/java/sip/communicator/util/Entities.java b/src/net/java/sip/communicator/util/Entities.java
index 46483c9..7efddbe 100644
--- a/src/net/java/sip/communicator/util/Entities.java
+++ b/src/net/java/sip/communicator/util/Entities.java
@@ -17,12 +17,8 @@
 
 package net.java.sip.communicator.util;
 
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TreeMap;
+import java.io.*;
+import java.util.*;
 
 /**
  * <p>
diff --git a/src/net/java/sip/communicator/util/NetworkUtils.java b/src/net/java/sip/communicator/util/NetworkUtils.java
index d0d543c..5361363 100644
--- a/src/net/java/sip/communicator/util/NetworkUtils.java
+++ b/src/net/java/sip/communicator/util/NetworkUtils.java
@@ -8,6 +8,7 @@ package net.java.sip.communicator.util;
 
 import java.beans.*;
 import java.net.*;
+import java.text.*;
 import java.util.*;
 import java.util.concurrent.atomic.*;
 
@@ -16,8 +17,6 @@ import net.java.sip.communicator.util.dns.*;
 
 import org.xbill.DNS.*;
 
-import java.text.*;
-
 /**
  * Utility methods and fields to use when working with network addresses.
  *
diff --git a/src/net/java/sip/communicator/util/ScLogFormatter.java b/src/net/java/sip/communicator/util/ScLogFormatter.java
index 6c8f7a8..283de41 100644
--- a/src/net/java/sip/communicator/util/ScLogFormatter.java
+++ b/src/net/java/sip/communicator/util/ScLogFormatter.java
@@ -7,9 +7,9 @@
 package net.java.sip.communicator.util;
 
 import java.io.*;
-import java.util.logging.*;
-import java.util.*;
 import java.text.*;
+import java.util.*;
+import java.util.logging.*;
 
 /**
  * Print a brief summary of the LogRecord in a human readable. The summary will
diff --git a/src/net/java/sip/communicator/util/UtilActivator.java b/src/net/java/sip/communicator/util/UtilActivator.java
index 852f2f8..5f17974 100644
--- a/src/net/java/sip/communicator/util/UtilActivator.java
+++ b/src/net/java/sip/communicator/util/UtilActivator.java
@@ -11,11 +11,11 @@ import java.net.*;
 
 import javax.imageio.*;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.keybindings.*;
 import net.java.sip.communicator.service.netaddr.*;
 import net.java.sip.communicator.service.resources.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/util/dns/ConfigurableDnssecResolver.java b/src/net/java/sip/communicator/util/dns/ConfigurableDnssecResolver.java
index 6733d61..31ba3d1 100644
--- a/src/net/java/sip/communicator/util/dns/ConfigurableDnssecResolver.java
+++ b/src/net/java/sip/communicator/util/dns/ConfigurableDnssecResolver.java
@@ -12,11 +12,11 @@ import java.util.*;
 

 import javax.swing.*;

 

-import org.jitsi.service.configuration.*;

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

 import net.java.sip.communicator.util.*;

 import net.java.sip.communicator.util.swing.*;

 

+import org.jitsi.service.configuration.*;

 import org.jitsi.service.resources.*;

 import org.xbill.DNS.*;

 

diff --git a/src/net/java/sip/communicator/util/dns/DnsUtilActivator.java b/src/net/java/sip/communicator/util/dns/DnsUtilActivator.java
index 853adfc..845d400 100644
--- a/src/net/java/sip/communicator/util/dns/DnsUtilActivator.java
+++ b/src/net/java/sip/communicator/util/dns/DnsUtilActivator.java
@@ -6,11 +6,11 @@
  */
 package net.java.sip.communicator.util.dns;
 
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.notification.*;
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 import org.xbill.DNS.*;
diff --git a/src/net/java/sip/communicator/util/dns/DnssecRuntimeException.java b/src/net/java/sip/communicator/util/dns/DnssecRuntimeException.java
index 0df45ac..65402b8 100644
--- a/src/net/java/sip/communicator/util/dns/DnssecRuntimeException.java
+++ b/src/net/java/sip/communicator/util/dns/DnssecRuntimeException.java
@@ -6,7 +6,7 @@
  */

 package net.java.sip.communicator.util.dns;

 

-import java.net.UnknownHostException;

+import java.net.*;

 

 /**

  * Runtime exception that is thrown when a DNSSEC validation failure occurred.

diff --git a/src/net/java/sip/communicator/util/dns/SecureMessage.java b/src/net/java/sip/communicator/util/dns/SecureMessage.java
index 13eb943..a519e0e 100644
--- a/src/net/java/sip/communicator/util/dns/SecureMessage.java
+++ b/src/net/java/sip/communicator/util/dns/SecureMessage.java
@@ -6,9 +6,9 @@
  */

 package net.java.sip.communicator.util.dns;

 

-import java.io.IOException;

+import java.io.*;

 

-import org.xbill.DNS.Message;

+import org.xbill.DNS.*;

 

 /**

  * DNS Message that adds DNSSEC validation information.

diff --git a/src/net/java/sip/communicator/util/swing/LightGrayFilter.java b/src/net/java/sip/communicator/util/swing/LightGrayFilter.java
index 3b3066e..83549c4 100644
--- a/src/net/java/sip/communicator/util/swing/LightGrayFilter.java
+++ b/src/net/java/sip/communicator/util/swing/LightGrayFilter.java
@@ -8,6 +8,7 @@ package net.java.sip.communicator.util.swing;
 
 import java.awt.*;
 import java.awt.image.*;
+
 import javax.swing.*;
 
 /**
diff --git a/src/net/java/sip/communicator/util/swing/PopupNotificationPanel.java b/src/net/java/sip/communicator/util/swing/PopupNotificationPanel.java
index 7ca04be..a3ad772 100644
--- a/src/net/java/sip/communicator/util/swing/PopupNotificationPanel.java
+++ b/src/net/java/sip/communicator/util/swing/PopupNotificationPanel.java
@@ -9,6 +9,7 @@ package net.java.sip.communicator.util.swing;
 
 import java.awt.*;
 import java.awt.event.*;
+
 import javax.swing.*;
 
 import net.java.sip.communicator.util.*;
diff --git a/src/net/java/sip/communicator/util/swing/SIPCommLinkButton.java b/src/net/java/sip/communicator/util/swing/SIPCommLinkButton.java
index 57da9a7..0cabe5c 100644
--- a/src/net/java/sip/communicator/util/swing/SIPCommLinkButton.java
+++ b/src/net/java/sip/communicator/util/swing/SIPCommLinkButton.java
@@ -6,13 +6,13 @@
  */
 package net.java.sip.communicator.util.swing;
 
-import net.java.sip.communicator.util.swing.plaf.*;
-
 import java.awt.*;
 import java.net.*;
 
 import javax.swing.*;
 
+import net.java.sip.communicator.util.swing.plaf.*;
+
 /**
  * A button which text is a link. The button looks like a link.
  */
diff --git a/src/net/java/sip/communicator/util/swing/SipCommFileChooserImpl.java b/src/net/java/sip/communicator/util/swing/SipCommFileChooserImpl.java
index dfb27b7..33f35d8 100644
--- a/src/net/java/sip/communicator/util/swing/SipCommFileChooserImpl.java
+++ b/src/net/java/sip/communicator/util/swing/SipCommFileChooserImpl.java
@@ -8,6 +8,7 @@ package net.java.sip.communicator.util.swing;
 
 import java.awt.*;
 import java.io.*;
+
 import javax.swing.*;
 
 /**
diff --git a/src/net/java/sip/communicator/util/swing/SipCommFileFilter.java b/src/net/java/sip/communicator/util/swing/SipCommFileFilter.java
index a016a9c..bddee99 100644
--- a/src/net/java/sip/communicator/util/swing/SipCommFileFilter.java
+++ b/src/net/java/sip/communicator/util/swing/SipCommFileFilter.java
@@ -6,9 +6,9 @@
  */
 package net.java.sip.communicator.util.swing;
 
-import java.io.File;
+import java.io.*;
+
 import javax.swing.filechooser.FileFilter;
-import java.io.FilenameFilter;
 
 
 /**
diff --git a/src/net/java/sip/communicator/util/swing/SwingWorker.java b/src/net/java/sip/communicator/util/swing/SwingWorker.java
index aa2d906..d0688a5 100644
--- a/src/net/java/sip/communicator/util/swing/SwingWorker.java
+++ b/src/net/java/sip/communicator/util/swing/SwingWorker.java
@@ -16,9 +16,9 @@
  */
 package net.java.sip.communicator.util.swing;
 
-import java.lang.Thread.*;
+import java.lang.Thread.UncaughtExceptionHandler;
 
-import javax.swing.SwingUtilities;
+import javax.swing.*;
 
 /**
  * Utility class based on the javax.swing.SwingWorker. <tt>SwingWorker</tt> is
diff --git a/src/net/java/sip/communicator/util/swing/plaf/SIPCommLinkButtonUI.java b/src/net/java/sip/communicator/util/swing/plaf/SIPCommLinkButtonUI.java
index 6a0f577..fa0851d 100644
--- a/src/net/java/sip/communicator/util/swing/plaf/SIPCommLinkButtonUI.java
+++ b/src/net/java/sip/communicator/util/swing/plaf/SIPCommLinkButtonUI.java
@@ -6,14 +6,14 @@
  */
 package net.java.sip.communicator.util.swing.plaf;
 
-import net.java.sip.communicator.util.swing.*;
-
 import java.awt.*;
 
 import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
+import net.java.sip.communicator.util.swing.*;
+
 /**
  * The SIPCommLinkButtonUI implementation.
  * @author ROTH Damien
diff --git a/src/net/java/sip/communicator/util/swing/transparent/AWTUtilitiesWrapper.java b/src/net/java/sip/communicator/util/swing/transparent/AWTUtilitiesWrapper.java
index e72c385..35acbdd 100644
--- a/src/net/java/sip/communicator/util/swing/transparent/AWTUtilitiesWrapper.java
+++ b/src/net/java/sip/communicator/util/swing/transparent/AWTUtilitiesWrapper.java
@@ -9,11 +9,8 @@
  */
 package net.java.sip.communicator.util.swing.transparent;
 
-import java.awt.GraphicsConfiguration;
-import java.awt.Shape;
-import java.awt.Window;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+import java.awt.*;
+import java.lang.reflect.*;
 
 import net.java.sip.communicator.util.*;
 
diff --git a/src/net/java/sip/communicator/util/xml/XMLUtils.java b/src/net/java/sip/communicator/util/xml/XMLUtils.java
index b64d692..8dad06a 100644
--- a/src/net/java/sip/communicator/util/xml/XMLUtils.java
+++ b/src/net/java/sip/communicator/util/xml/XMLUtils.java
@@ -6,22 +6,27 @@
  */
 package net.java.sip.communicator.util.xml;
 
+import static javax.xml.XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI;
+import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI;
+import static javax.xml.XMLConstants.XMLNS_ATTRIBUTE_NS_URI;
+import static javax.xml.XMLConstants.XML_NS_URI;
+import static net.java.sip.communicator.util.StringUtils.fromString;
+import static net.java.sip.communicator.util.StringUtils.isEquals;
+import static net.java.sip.communicator.util.StringUtils.isNullOrEmpty;
+
 import java.io.*;
 import java.util.*;
 
+import javax.xml.*;
+import javax.xml.parsers.*;
 import javax.xml.transform.*;
 import javax.xml.transform.dom.*;
 import javax.xml.transform.stream.*;
 
-import org.w3c.dom.*;
-
-import javax.xml.*;
-import static javax.xml.XMLConstants.*;
-import javax.xml.parsers.*;
-
-import static net.java.sip.communicator.util.StringUtils.*;
 import net.java.sip.communicator.util.*;
 
+import org.w3c.dom.*;
+
 /**
  * Common XML Tasks
  *
diff --git a/test/net/java/sip/communicator/slick/callhistory/CallHistoryServiceLick.java b/test/net/java/sip/communicator/slick/callhistory/CallHistoryServiceLick.java
index 02cf54f..3aef235 100644
--- a/test/net/java/sip/communicator/slick/callhistory/CallHistoryServiceLick.java
+++ b/test/net/java/sip/communicator/slick/callhistory/CallHistoryServiceLick.java
@@ -8,10 +8,11 @@ package net.java.sip.communicator.slick.callhistory;
 
 import java.util.*;
 
-import org.osgi.framework.*;
 import junit.framework.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  *
  * @author Damian Minkov
diff --git a/test/net/java/sip/communicator/slick/callhistory/TestCallHistoryService.java b/test/net/java/sip/communicator/slick/callhistory/TestCallHistoryService.java
index 3a5468c..71716e2 100644
--- a/test/net/java/sip/communicator/slick/callhistory/TestCallHistoryService.java
+++ b/test/net/java/sip/communicator/slick/callhistory/TestCallHistoryService.java
@@ -8,7 +8,6 @@ package net.java.sip.communicator.slick.callhistory;
 
 import java.util.*;
 
-import org.osgi.framework.*;
 import junit.framework.*;
 import net.java.sip.communicator.impl.protocol.mock.*;
 import net.java.sip.communicator.service.callhistory.*;
@@ -16,6 +15,8 @@ import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * Tests call history.
  * First installs the MockProtocolProvider to be able to create som calls
diff --git a/test/net/java/sip/communicator/slick/configuration/ConfigurationServiceLick.java b/test/net/java/sip/communicator/slick/configuration/ConfigurationServiceLick.java
index c16a9a3..eb58d52 100644
--- a/test/net/java/sip/communicator/slick/configuration/ConfigurationServiceLick.java
+++ b/test/net/java/sip/communicator/slick/configuration/ConfigurationServiceLick.java
@@ -8,11 +8,12 @@ package net.java.sip.communicator.slick.configuration;
 
 import java.util.*;
 
-import org.osgi.framework.*;
 import junit.framework.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
+import org.osgi.framework.*;
+
 /**
  * @author Emil Ivov
  */
diff --git a/test/net/java/sip/communicator/slick/configuration/TestConfigurationServicePersistency.java b/test/net/java/sip/communicator/slick/configuration/TestConfigurationServicePersistency.java
index 4b91299..7af0dbd 100644
--- a/test/net/java/sip/communicator/slick/configuration/TestConfigurationServicePersistency.java
+++ b/test/net/java/sip/communicator/slick/configuration/TestConfigurationServicePersistency.java
@@ -7,14 +7,16 @@
 package net.java.sip.communicator.slick.configuration;
 
 import java.io.*;
+
 import javax.xml.parsers.*;
 
-import org.osgi.framework.*;
-import org.w3c.dom.*;
 import junit.framework.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.util.xml.*;
 
+import org.jitsi.service.configuration.*;
+import org.osgi.framework.*;
+import org.w3c.dom.*;
+
 /**
  * Tests ConfiguratioService persistency, which means that it makes the
  * ConfigurationService store and load its properties from a file and checks
diff --git a/test/net/java/sip/communicator/slick/configuration/TestConfigurationSlickFinalizer.java b/test/net/java/sip/communicator/slick/configuration/TestConfigurationSlickFinalizer.java
index ee4449c..f95b7a5 100644
--- a/test/net/java/sip/communicator/slick/configuration/TestConfigurationSlickFinalizer.java
+++ b/test/net/java/sip/communicator/slick/configuration/TestConfigurationSlickFinalizer.java
@@ -9,8 +9,8 @@ package net.java.sip.communicator.slick.configuration;
 import java.util.*;
 
 import junit.framework.*;
-import org.jitsi.service.configuration.*;
 
+import org.jitsi.service.configuration.*;
 import org.osgi.framework.*;
 
 /**
diff --git a/test/net/java/sip/communicator/slick/contactlist/MclSlickFixture.java b/test/net/java/sip/communicator/slick/contactlist/MclSlickFixture.java
index 2c4ddd0..fd52391 100644
--- a/test/net/java/sip/communicator/slick/contactlist/MclSlickFixture.java
+++ b/test/net/java/sip/communicator/slick/contactlist/MclSlickFixture.java
@@ -2,11 +2,12 @@ package net.java.sip.communicator.slick.contactlist;
 
 import java.util.*;
 
-import org.osgi.framework.*;
 import net.java.sip.communicator.impl.protocol.mock.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.protocol.*;
 
+import org.osgi.framework.*;
+
 /**
  * Fields, commonly used by the MetaContactListSlick.
  *
diff --git a/test/net/java/sip/communicator/slick/contactlist/MetaContactListServiceLick.java b/test/net/java/sip/communicator/slick/contactlist/MetaContactListServiceLick.java
index ceffcb0..e8b6b38 100644
--- a/test/net/java/sip/communicator/slick/contactlist/MetaContactListServiceLick.java
+++ b/test/net/java/sip/communicator/slick/contactlist/MetaContactListServiceLick.java
@@ -8,13 +8,14 @@ package net.java.sip.communicator.slick.contactlist;
 
 import java.util.*;
 
-import org.osgi.framework.*;
 import junit.framework.*;
 import net.java.sip.communicator.impl.protocol.mock.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * Performs testing of the MetaContactListService. This SLICK would register
  * a mock protocol provider, manually fill in its protocol specific contact
diff --git a/test/net/java/sip/communicator/slick/contactlist/TestMetaContactListPersistence.java b/test/net/java/sip/communicator/slick/contactlist/TestMetaContactListPersistence.java
index 9682fac..45bfd5b 100644
--- a/test/net/java/sip/communicator/slick/contactlist/TestMetaContactListPersistence.java
+++ b/test/net/java/sip/communicator/slick/contactlist/TestMetaContactListPersistence.java
@@ -2,12 +2,13 @@ package net.java.sip.communicator.slick.contactlist;
 
 import java.util.*;
 
-import org.osgi.framework.*;
 import junit.framework.*;
 import net.java.sip.communicator.impl.protocol.mock.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.protocol.*;
 
+import org.osgi.framework.*;
+
 /**
  * Tests in this class verify whether storing and reloading the meta contact
  * list after killing the meta contact list bundle work well.
diff --git a/test/net/java/sip/communicator/slick/credentialsstorage/CredentialsStorageServiceLick.java b/test/net/java/sip/communicator/slick/credentialsstorage/CredentialsStorageServiceLick.java
index 90c27ed..bc709f7 100644
--- a/test/net/java/sip/communicator/slick/credentialsstorage/CredentialsStorageServiceLick.java
+++ b/test/net/java/sip/communicator/slick/credentialsstorage/CredentialsStorageServiceLick.java
@@ -9,7 +9,6 @@ package net.java.sip.communicator.slick.credentialsstorage;
 import java.util.*;
 
 import junit.framework.*;
-
 import net.java.sip.communicator.service.credentialsstorage.*;
 import net.java.sip.communicator.util.*;
 
diff --git a/test/net/java/sip/communicator/slick/history/HistoryServiceLick.java b/test/net/java/sip/communicator/slick/history/HistoryServiceLick.java
index 67223ae..cda9e4c 100644
--- a/test/net/java/sip/communicator/slick/history/HistoryServiceLick.java
+++ b/test/net/java/sip/communicator/slick/history/HistoryServiceLick.java
@@ -8,10 +8,11 @@ package net.java.sip.communicator.slick.history;
 
 import java.util.*;
 
-import org.osgi.framework.*;
 import junit.framework.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * This class launches the bundle of which test the history bundle. this bundle
  * is a set of (j)unit tests. It should be launched by the cruisecontrol module.
diff --git a/test/net/java/sip/communicator/slick/history/TestHistoryService.java b/test/net/java/sip/communicator/slick/history/TestHistoryService.java
index 1501cd1..f9fc920 100644
--- a/test/net/java/sip/communicator/slick/history/TestHistoryService.java
+++ b/test/net/java/sip/communicator/slick/history/TestHistoryService.java
@@ -8,11 +8,12 @@ package net.java.sip.communicator.slick.history;
 
 import java.util.*;
 
-import org.osgi.framework.*;
 import junit.framework.*;
 import net.java.sip.communicator.service.history.*;
 import net.java.sip.communicator.service.history.records.*;
 
+import org.osgi.framework.*;
+
 public class TestHistoryService extends TestCase {
 
     private static HistoryRecordStructure recordStructure =
diff --git a/test/net/java/sip/communicator/slick/metahistory/MetaHistoryServiceLick.java b/test/net/java/sip/communicator/slick/metahistory/MetaHistoryServiceLick.java
index 2a4125d..92c8e38 100644
--- a/test/net/java/sip/communicator/slick/metahistory/MetaHistoryServiceLick.java
+++ b/test/net/java/sip/communicator/slick/metahistory/MetaHistoryServiceLick.java
@@ -8,10 +8,11 @@ package net.java.sip.communicator.slick.metahistory;
 
 import java.util.*;
 
-import org.osgi.framework.*;
 import junit.framework.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  *
  * @author Damian Minkov
diff --git a/test/net/java/sip/communicator/slick/metahistory/TestMetaHistoryService.java b/test/net/java/sip/communicator/slick/metahistory/TestMetaHistoryService.java
index 95c176a..6b0be0f 100644
--- a/test/net/java/sip/communicator/slick/metahistory/TestMetaHistoryService.java
+++ b/test/net/java/sip/communicator/slick/metahistory/TestMetaHistoryService.java
@@ -6,24 +6,22 @@
  */
 package net.java.sip.communicator.slick.metahistory;
 
-import java.io.File;
+import java.io.*;
 import java.util.*;
 
-import org.osgi.framework.*;
 import junit.framework.*;
 import net.java.sip.communicator.impl.protocol.mock.*;
-import net.java.sip.communicator.service.callhistory.CallHistoryService;
-import net.java.sip.communicator.service.callhistory.CallPeerRecord;
-import net.java.sip.communicator.service.callhistory.CallRecord;
+import net.java.sip.communicator.service.callhistory.*;
 import net.java.sip.communicator.service.contactlist.*;
-import net.java.sip.communicator.service.filehistory.FileHistoryService;
-import net.java.sip.communicator.service.filehistory.FileRecord;
+import net.java.sip.communicator.service.filehistory.*;
 import net.java.sip.communicator.service.metahistory.*;
 import net.java.sip.communicator.service.msghistory.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * Tests file message history.
  * First installs the MoxkProtocolProvider to be able to send some files
diff --git a/test/net/java/sip/communicator/slick/msghistory/MsgHistoryServiceLick.java b/test/net/java/sip/communicator/slick/msghistory/MsgHistoryServiceLick.java
index d024e22..b1b0ed5 100644
--- a/test/net/java/sip/communicator/slick/msghistory/MsgHistoryServiceLick.java
+++ b/test/net/java/sip/communicator/slick/msghistory/MsgHistoryServiceLick.java
@@ -8,10 +8,11 @@ package net.java.sip.communicator.slick.msghistory;
 
 import java.util.*;
 
-import org.osgi.framework.*;
 import junit.framework.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  *
  * @author Damian Minkov
diff --git a/test/net/java/sip/communicator/slick/netaddr/NetworkAddressManagerServiceLick.java b/test/net/java/sip/communicator/slick/netaddr/NetworkAddressManagerServiceLick.java
index 21e9d74..776cb3f 100644
--- a/test/net/java/sip/communicator/slick/netaddr/NetworkAddressManagerServiceLick.java
+++ b/test/net/java/sip/communicator/slick/netaddr/NetworkAddressManagerServiceLick.java
@@ -2,10 +2,11 @@ package net.java.sip.communicator.slick.netaddr;
 
 import java.util.*;
 
-import org.osgi.framework.*;
 import junit.framework.*;
 import net.java.sip.communicator.service.netaddr.*;
 import net.java.sip.communicator.util.*;
+
+import org.osgi.framework.*;
 /**
  * This class launche the bundle of which test the NetworkManagerBundle
  * this bundle is a set of (j)unit tests. It aim to be launch by the
diff --git a/test/net/java/sip/communicator/slick/netaddr/TestNetworkAddressManagerService.java b/test/net/java/sip/communicator/slick/netaddr/TestNetworkAddressManagerService.java
index 18b98cf..dc86b2f 100644
--- a/test/net/java/sip/communicator/slick/netaddr/TestNetworkAddressManagerService.java
+++ b/test/net/java/sip/communicator/slick/netaddr/TestNetworkAddressManagerService.java
@@ -3,12 +3,13 @@ package net.java.sip.communicator.slick.netaddr;
 import java.net.*;
 import java.util.*;
 
-import org.osgi.framework.*;
 import junit.framework.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.netaddr.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
+import org.osgi.framework.*;
+
 /**
  * Tests basic Network Address Manager Service behaviour.
  *
diff --git a/test/net/java/sip/communicator/slick/popupmessagehandler/PopupMessageHandlerSLick.java b/test/net/java/sip/communicator/slick/popupmessagehandler/PopupMessageHandlerSLick.java
index 865e8b2..ce98ced 100644
--- a/test/net/java/sip/communicator/slick/popupmessagehandler/PopupMessageHandlerSLick.java
+++ b/test/net/java/sip/communicator/slick/popupmessagehandler/PopupMessageHandlerSLick.java
@@ -9,11 +9,10 @@ package net.java.sip.communicator.slick.popupmessagehandler;
 import java.util.*;

 

 import junit.framework.*;

+import net.java.sip.communicator.util.*;

 

 import org.osgi.framework.*;

 

-import net.java.sip.communicator.util.*;

-

 /**

  *

  * @author Symphorien Wanko

diff --git a/test/net/java/sip/communicator/slick/popupmessagehandler/TestPopupMessageHandler.java b/test/net/java/sip/communicator/slick/popupmessagehandler/TestPopupMessageHandler.java
index b8c47a9..babec92 100644
--- a/test/net/java/sip/communicator/slick/popupmessagehandler/TestPopupMessageHandler.java
+++ b/test/net/java/sip/communicator/slick/popupmessagehandler/TestPopupMessageHandler.java
@@ -7,14 +7,13 @@
 package net.java.sip.communicator.slick.popupmessagehandler;
 
 import junit.framework.*;
-
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.notification.*;
 import net.java.sip.communicator.service.systray.*;
 import net.java.sip.communicator.service.systray.event.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 
 /**
  * Test suite for the popup message handler interface.
diff --git a/test/net/java/sip/communicator/slick/protocol/GenericProtocolProviderServiceLick.java b/test/net/java/sip/communicator/slick/protocol/GenericProtocolProviderServiceLick.java
index ceb8b6a..9916e00 100644
--- a/test/net/java/sip/communicator/slick/protocol/GenericProtocolProviderServiceLick.java
+++ b/test/net/java/sip/communicator/slick/protocol/GenericProtocolProviderServiceLick.java
@@ -6,10 +6,10 @@
  */
 package net.java.sip.communicator.slick.protocol;
 
-import org.osgi.framework.*;
-
 import junit.framework.*;
 
+import org.osgi.framework.*;
+
 /**
  * The generic protocol provider SLICK implements a set of tests that any
  * protocol provider implementation should pass. It does not contain any
diff --git a/test/net/java/sip/communicator/slick/protocol/generic/AdHocMultiUserChatSlickFixture.java b/test/net/java/sip/communicator/slick/protocol/generic/AdHocMultiUserChatSlickFixture.java
index 1238551..4500d04 100644
--- a/test/net/java/sip/communicator/slick/protocol/generic/AdHocMultiUserChatSlickFixture.java
+++ b/test/net/java/sip/communicator/slick/protocol/generic/AdHocMultiUserChatSlickFixture.java
@@ -6,18 +6,13 @@
  */
 package net.java.sip.communicator.slick.protocol.generic;
 
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
+import java.util.*;
 
+import junit.framework.*;
 import net.java.sip.communicator.service.protocol.*;
 
 import org.osgi.framework.*;
 
-import junit.framework.*;
-
 /**
  * Generic Slick fixture for ad-hoc multi-user chat.
  * 
diff --git a/test/net/java/sip/communicator/slick/protocol/generic/TestOperationSetAdHocMultiUserChat.java b/test/net/java/sip/communicator/slick/protocol/generic/TestOperationSetAdHocMultiUserChat.java
index d91f039..65a1d23 100644
--- a/test/net/java/sip/communicator/slick/protocol/generic/TestOperationSetAdHocMultiUserChat.java
+++ b/test/net/java/sip/communicator/slick/protocol/generic/TestOperationSetAdHocMultiUserChat.java
@@ -8,10 +8,10 @@ package net.java.sip.communicator.slick.protocol.generic;
 
 import java.util.*;
 
+import junit.framework.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
-import junit.framework.*;
 
 /**
  * Generic tests suite for the ad-hoc multi-user chat functionality.
diff --git a/test/net/java/sip/communicator/slick/protocol/gibberish/GibberishProtocolProviderServiceLick.java b/test/net/java/sip/communicator/slick/protocol/gibberish/GibberishProtocolProviderServiceLick.java
index dd03904..f94ec2d 100644
--- a/test/net/java/sip/communicator/slick/protocol/gibberish/GibberishProtocolProviderServiceLick.java
+++ b/test/net/java/sip/communicator/slick/protocol/gibberish/GibberishProtocolProviderServiceLick.java
@@ -8,9 +8,10 @@ package net.java.sip.communicator.slick.protocol.gibberish;
 
 import java.util.*;
 
-import org.osgi.framework.*;
 import junit.framework.*;
 
+import org.osgi.framework.*;
+
 /**
  * Gibberish specific testing for a Gibberish Protocol Provider Service
  * implementation.
diff --git a/test/net/java/sip/communicator/slick/protocol/gibberish/GibberishSlickFixture.java b/test/net/java/sip/communicator/slick/protocol/gibberish/GibberishSlickFixture.java
index d045d34..9862b93 100644
--- a/test/net/java/sip/communicator/slick/protocol/gibberish/GibberishSlickFixture.java
+++ b/test/net/java/sip/communicator/slick/protocol/gibberish/GibberishSlickFixture.java
@@ -6,11 +6,12 @@
  */
 package net.java.sip.communicator.slick.protocol.gibberish;
 
-import org.osgi.framework.*;
+import java.util.*;
+
 import junit.framework.*;
 import net.java.sip.communicator.service.protocol.*;
-import java.util.Map;
-import java.util.*;
+
+import org.osgi.framework.*;
 
 /**
  * Contains fields and methods used by most or all tests in the Gibberish slick.
diff --git a/test/net/java/sip/communicator/slick/protocol/gibberish/TestAccountInstallation.java b/test/net/java/sip/communicator/slick/protocol/gibberish/TestAccountInstallation.java
index a03b112..b7d4a1e 100644
--- a/test/net/java/sip/communicator/slick/protocol/gibberish/TestAccountInstallation.java
+++ b/test/net/java/sip/communicator/slick/protocol/gibberish/TestAccountInstallation.java
@@ -8,10 +8,11 @@ package net.java.sip.communicator.slick.protocol.gibberish;
 
 import java.util.*;
 
-import org.osgi.framework.*;
 import junit.framework.*;
 import net.java.sip.communicator.service.protocol.*;
 
+import org.osgi.framework.*;
+
 /**
  * Installs test accounts and verifies whether they are available after
  * installation.
diff --git a/test/net/java/sip/communicator/slick/protocol/gibberish/TestAccountUninstallation.java b/test/net/java/sip/communicator/slick/protocol/gibberish/TestAccountUninstallation.java
index aee917a..75450fe 100644
--- a/test/net/java/sip/communicator/slick/protocol/gibberish/TestAccountUninstallation.java
+++ b/test/net/java/sip/communicator/slick/protocol/gibberish/TestAccountUninstallation.java
@@ -7,7 +7,6 @@
 package net.java.sip.communicator.slick.protocol.gibberish;
 
 import junit.framework.*;
-
 import net.java.sip.communicator.service.protocol.*;
 
 import org.osgi.framework.*;
diff --git a/test/net/java/sip/communicator/slick/protocol/gibberish/TestAccountUninstallationPersistence.java b/test/net/java/sip/communicator/slick/protocol/gibberish/TestAccountUninstallationPersistence.java
index 3159c78..f9c72be 100644
--- a/test/net/java/sip/communicator/slick/protocol/gibberish/TestAccountUninstallationPersistence.java
+++ b/test/net/java/sip/communicator/slick/protocol/gibberish/TestAccountUninstallationPersistence.java
@@ -6,11 +6,12 @@
  */
 package net.java.sip.communicator.slick.protocol.gibberish;
 
-import org.osgi.framework.*;
 import junit.framework.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.protocol.*;
 
+import org.jitsi.service.configuration.*;
+import org.osgi.framework.*;
+
 /**
  * Contains tests verifying persistence of account uninstallation. In other
  * words we try to make sure that once uninstalled an account remains
diff --git a/test/net/java/sip/communicator/slick/protocol/gibberish/TestOperationSetBasicInstantMessaging.java b/test/net/java/sip/communicator/slick/protocol/gibberish/TestOperationSetBasicInstantMessaging.java
index 9c1867d..19b8504 100644
--- a/test/net/java/sip/communicator/slick/protocol/gibberish/TestOperationSetBasicInstantMessaging.java
+++ b/test/net/java/sip/communicator/slick/protocol/gibberish/TestOperationSetBasicInstantMessaging.java
@@ -10,7 +10,6 @@ import java.io.*;
 import java.util.*;
 
 import junit.framework.*;
-
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
diff --git a/test/net/java/sip/communicator/slick/protocol/gibberish/TestOperationSetPersistentPresence.java b/test/net/java/sip/communicator/slick/protocol/gibberish/TestOperationSetPersistentPresence.java
index e0c981a..bf9aa9f 100644
--- a/test/net/java/sip/communicator/slick/protocol/gibberish/TestOperationSetPersistentPresence.java
+++ b/test/net/java/sip/communicator/slick/protocol/gibberish/TestOperationSetPersistentPresence.java
@@ -9,7 +9,6 @@ package net.java.sip.communicator.slick.protocol.gibberish;
 import java.util.*;
 
 import junit.framework.*;
-
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
diff --git a/test/net/java/sip/communicator/slick/protocol/gibberish/TestOperationSetPresence.java b/test/net/java/sip/communicator/slick/protocol/gibberish/TestOperationSetPresence.java
index 9cd1111..4366223 100644
--- a/test/net/java/sip/communicator/slick/protocol/gibberish/TestOperationSetPresence.java
+++ b/test/net/java/sip/communicator/slick/protocol/gibberish/TestOperationSetPresence.java
@@ -6,7 +6,7 @@
  */
 package net.java.sip.communicator.slick.protocol.gibberish;
 
-import java.beans.PropertyChangeEvent;
+import java.beans.*;
 import java.util.*;
 
 import junit.framework.*;
diff --git a/test/net/java/sip/communicator/slick/protocol/icq/IcqProtocolProviderSlick.java b/test/net/java/sip/communicator/slick/protocol/icq/IcqProtocolProviderSlick.java
index a22a409..1561a61 100644
--- a/test/net/java/sip/communicator/slick/protocol/icq/IcqProtocolProviderSlick.java
+++ b/test/net/java/sip/communicator/slick/protocol/icq/IcqProtocolProviderSlick.java
@@ -2,10 +2,11 @@ package net.java.sip.communicator.slick.protocol.icq;
 
 import java.util.*;
 
-import org.osgi.framework.*;
 import junit.framework.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * @author Emil Ivov
  */
diff --git a/test/net/java/sip/communicator/slick/protocol/icq/IcqSlickFixture.java b/test/net/java/sip/communicator/slick/protocol/icq/IcqSlickFixture.java
index df17ba6..358f885 100644
--- a/test/net/java/sip/communicator/slick/protocol/icq/IcqSlickFixture.java
+++ b/test/net/java/sip/communicator/slick/protocol/icq/IcqSlickFixture.java
@@ -8,11 +8,12 @@ package net.java.sip.communicator.slick.protocol.icq;
 
 import java.util.*;
 
-import org.osgi.framework.*;
 import junit.framework.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 
+import org.osgi.framework.*;
+
 /**
  * Provides utility code, such as locating and obtaining references towards
  * base services that anyother service would need.
diff --git a/test/net/java/sip/communicator/slick/protocol/icq/IcqTesterAgent.java b/test/net/java/sip/communicator/slick/protocol/icq/IcqTesterAgent.java
index 878f472..a1c2325 100644
--- a/test/net/java/sip/communicator/slick/protocol/icq/IcqTesterAgent.java
+++ b/test/net/java/sip/communicator/slick/protocol/icq/IcqTesterAgent.java
@@ -6,7 +6,7 @@
  */
 package net.java.sip.communicator.slick.protocol.icq;
 
-import java.beans.PropertyChangeEvent;
+import java.beans.*;
 import java.io.*;
 import java.util.*;
 
diff --git a/test/net/java/sip/communicator/slick/protocol/icq/TestAccountInstallation.java b/test/net/java/sip/communicator/slick/protocol/icq/TestAccountInstallation.java
index 7d7d53e..980211a 100644
--- a/test/net/java/sip/communicator/slick/protocol/icq/TestAccountInstallation.java
+++ b/test/net/java/sip/communicator/slick/protocol/icq/TestAccountInstallation.java
@@ -8,12 +8,13 @@ package net.java.sip.communicator.slick.protocol.icq;
 
 import java.util.*;
 
-import org.osgi.framework.*;
 import junit.framework.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * Tests basic provider factory functionalitites
  * @author Emil Ivov
diff --git a/test/net/java/sip/communicator/slick/protocol/icq/TestAccountUninstallation.java b/test/net/java/sip/communicator/slick/protocol/icq/TestAccountUninstallation.java
index 8e6a4f8..45a5d4c 100644
--- a/test/net/java/sip/communicator/slick/protocol/icq/TestAccountUninstallation.java
+++ b/test/net/java/sip/communicator/slick/protocol/icq/TestAccountUninstallation.java
@@ -6,12 +6,13 @@
  */
 package net.java.sip.communicator.slick.protocol.icq;
 
-import org.osgi.framework.*;
 import junit.framework.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * Tests whether accaounts are uninstalled properly. It is important that
  * tests from this class be called last since they will install the accounts
diff --git a/test/net/java/sip/communicator/slick/protocol/icq/TestAccountUninstallationPersistence.java b/test/net/java/sip/communicator/slick/protocol/icq/TestAccountUninstallationPersistence.java
index 64508d3..e05c63d 100644
--- a/test/net/java/sip/communicator/slick/protocol/icq/TestAccountUninstallationPersistence.java
+++ b/test/net/java/sip/communicator/slick/protocol/icq/TestAccountUninstallationPersistence.java
@@ -6,11 +6,12 @@
  */
 package net.java.sip.communicator.slick.protocol.icq;
 
-import org.osgi.framework.*;
 import junit.framework.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.protocol.*;
 
+import org.jitsi.service.configuration.*;
+import org.osgi.framework.*;
+
 /**
  * Contains tests verifying persistence of account uninstallation. In other
  * words we try to make sure that once uninstalled an account remains
diff --git a/test/net/java/sip/communicator/slick/protocol/icq/TestOperationSetFileTransferImpl.java b/test/net/java/sip/communicator/slick/protocol/icq/TestOperationSetFileTransferImpl.java
index bfb25bb..c257f73 100644
--- a/test/net/java/sip/communicator/slick/protocol/icq/TestOperationSetFileTransferImpl.java
+++ b/test/net/java/sip/communicator/slick/protocol/icq/TestOperationSetFileTransferImpl.java
@@ -7,15 +7,15 @@
 package net.java.sip.communicator.slick.protocol.icq;
 
 import java.util.*;
-import junit.framework.*;
-
-import org.osgi.framework.*;
 
+import junit.framework.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.slick.protocol.generic.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * Implementation for generic file transfer.
  * @author Damian Minkov
diff --git a/test/net/java/sip/communicator/slick/protocol/icq/TestOperationSetPresence.java b/test/net/java/sip/communicator/slick/protocol/icq/TestOperationSetPresence.java
index 87bc01d..059f059 100644
--- a/test/net/java/sip/communicator/slick/protocol/icq/TestOperationSetPresence.java
+++ b/test/net/java/sip/communicator/slick/protocol/icq/TestOperationSetPresence.java
@@ -6,7 +6,7 @@
  */
 package net.java.sip.communicator.slick.protocol.icq;
 
-import java.beans.PropertyChangeEvent;
+import java.beans.*;
 import java.util.*;
 
 import junit.framework.*;
diff --git a/test/net/java/sip/communicator/slick/protocol/icq/TestOperationSetServerStoredInfo.java b/test/net/java/sip/communicator/slick/protocol/icq/TestOperationSetServerStoredInfo.java
index 9106c86..33b73a4 100644
--- a/test/net/java/sip/communicator/slick/protocol/icq/TestOperationSetServerStoredInfo.java
+++ b/test/net/java/sip/communicator/slick/protocol/icq/TestOperationSetServerStoredInfo.java
@@ -10,7 +10,7 @@ import java.util.*;
 
 import junit.framework.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.protocol.ServerStoredDetails.*;
+import net.java.sip.communicator.service.protocol.ServerStoredDetails.GenericDetail;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/test/net/java/sip/communicator/slick/protocol/jabber/JabberProtocolProviderServiceLick.java b/test/net/java/sip/communicator/slick/protocol/jabber/JabberProtocolProviderServiceLick.java
index db00976..59cdadf 100644
--- a/test/net/java/sip/communicator/slick/protocol/jabber/JabberProtocolProviderServiceLick.java
+++ b/test/net/java/sip/communicator/slick/protocol/jabber/JabberProtocolProviderServiceLick.java
@@ -8,9 +8,10 @@ package net.java.sip.communicator.slick.protocol.jabber;
 
 import java.util.*;
 
-import org.osgi.framework.*;
 import junit.framework.*;
 
+import org.osgi.framework.*;
+
 /**
  * Jabber specific testing for a Jabber Protocol Provider Service implementation.
  * The test suite registers two accounts for
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 ce5eaf4..431df22 100644
--- a/test/net/java/sip/communicator/slick/protocol/jabber/JabberSlickFixture.java
+++ b/test/net/java/sip/communicator/slick/protocol/jabber/JabberSlickFixture.java
@@ -8,12 +8,11 @@ package net.java.sip.communicator.slick.protocol.jabber;
 
 import java.util.*;
 
-import org.osgi.framework.*;
-
 import junit.framework.*;
-
 import net.java.sip.communicator.service.protocol.*;
 
+import org.osgi.framework.*;
+
 /**
  * Contains fields and methods used by most or all tests in the Jabber slick.
  *
diff --git a/test/net/java/sip/communicator/slick/protocol/jabber/TestAccountInstallation.java b/test/net/java/sip/communicator/slick/protocol/jabber/TestAccountInstallation.java
index 72d32ee..dda7121 100644
--- a/test/net/java/sip/communicator/slick/protocol/jabber/TestAccountInstallation.java
+++ b/test/net/java/sip/communicator/slick/protocol/jabber/TestAccountInstallation.java
@@ -8,12 +8,13 @@ package net.java.sip.communicator.slick.protocol.jabber;
 
 import java.util.*;
 
-import org.osgi.framework.*;
 import junit.framework.*;
 import net.java.sip.communicator.service.certificate.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.protocol.*;
 
+import org.jitsi.service.configuration.*;
+import org.osgi.framework.*;
+
 /**
  * Test for account installation.
  *
diff --git a/test/net/java/sip/communicator/slick/protocol/jabber/TestAccountUninstallation.java b/test/net/java/sip/communicator/slick/protocol/jabber/TestAccountUninstallation.java
index dcd77f9..db36592 100644
--- a/test/net/java/sip/communicator/slick/protocol/jabber/TestAccountUninstallation.java
+++ b/test/net/java/sip/communicator/slick/protocol/jabber/TestAccountUninstallation.java
@@ -6,10 +6,11 @@
  */
 package net.java.sip.communicator.slick.protocol.jabber;
 
-import org.osgi.framework.*;
 import junit.framework.*;
 import net.java.sip.communicator.service.protocol.*;
 
+import org.osgi.framework.*;
+
 /**
  * Tests whether accounts are uninstalled properly. It is important that
  * tests from this class be called last since they will install the accounts
diff --git a/test/net/java/sip/communicator/slick/protocol/jabber/TestAccountUninstallationPersistence.java b/test/net/java/sip/communicator/slick/protocol/jabber/TestAccountUninstallationPersistence.java
index 9cbaa58..007339d 100644
--- a/test/net/java/sip/communicator/slick/protocol/jabber/TestAccountUninstallationPersistence.java
+++ b/test/net/java/sip/communicator/slick/protocol/jabber/TestAccountUninstallationPersistence.java
@@ -6,11 +6,12 @@
  */
 package net.java.sip.communicator.slick.protocol.jabber;
 
-import org.osgi.framework.*;
 import junit.framework.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.protocol.*;
 
+import org.jitsi.service.configuration.*;
+import org.osgi.framework.*;
+
 /**
  * Contains tests verifying persistence of account uninstallation. In other
  * words we try to make sure that once uninstalled an account remains
diff --git a/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetBasicTelephonyJabberImpl.java b/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetBasicTelephonyJabberImpl.java
index 85bcd69..c7dd668 100644
--- a/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetBasicTelephonyJabberImpl.java
+++ b/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetBasicTelephonyJabberImpl.java
@@ -6,12 +6,13 @@
  */
 package net.java.sip.communicator.slick.protocol.jabber;
 
+import java.text.*;
+import java.util.*;
+
 import junit.framework.*;
-import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.service.protocol.*;
-import java.text.ParseException;
 import net.java.sip.communicator.service.protocol.event.*;
-import java.util.*;
+import net.java.sip.communicator.util.*;
 
 /**
  * Tests Basic telephony functionality by making one provider call the other.
diff --git a/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetFileTransferImpl.java b/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetFileTransferImpl.java
index 7b0182f..84ff049 100644
--- a/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetFileTransferImpl.java
+++ b/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetFileTransferImpl.java
@@ -7,9 +7,11 @@
 package net.java.sip.communicator.slick.protocol.jabber;
 
 import java.util.*;
+
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.slick.protocol.generic.*;
 import net.java.sip.communicator.util.*;
+
 import org.osgi.framework.*;
 
 /**
diff --git a/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetInstantMessageTransformJabberImpl.java b/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetInstantMessageTransformJabberImpl.java
index c578eb4..3ec9aee 100644
--- a/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetInstantMessageTransformJabberImpl.java
+++ b/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetInstantMessageTransformJabberImpl.java
@@ -2,11 +2,11 @@ package net.java.sip.communicator.slick.protocol.jabber;
 
 import java.util.*;
 
+import junit.framework.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.slick.protocol.generic.*;
 import net.java.sip.communicator.util.*;
-import junit.framework.*;
 
 public class TestOperationSetInstantMessageTransformJabberImpl
     extends TestCase
diff --git a/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetMultiUserChat2.java b/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetMultiUserChat2.java
index 3258fe6..4d5fcc6 100644
--- a/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetMultiUserChat2.java
+++ b/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetMultiUserChat2.java
@@ -8,14 +8,13 @@ package net.java.sip.communicator.slick.protocol.jabber;
 
 import java.util.*;
 
-import org.jivesoftware.smack.util.StringUtils;
-
 import junit.framework.*;
-
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 
+import org.jivesoftware.smack.util.StringUtils;
+
 /**
  * Tests multi user chat functionalities.
  *
diff --git a/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetPresence.java b/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetPresence.java
index bb461eb..fbc269a 100644
--- a/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetPresence.java
+++ b/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetPresence.java
@@ -6,7 +6,7 @@
  */
 package net.java.sip.communicator.slick.protocol.jabber;
 
-import java.beans.PropertyChangeEvent;
+import java.beans.*;
 import java.util.*;
 
 import junit.framework.*;
diff --git a/test/net/java/sip/communicator/slick/protocol/msn/MsnProtocolProviderServiceLick.java b/test/net/java/sip/communicator/slick/protocol/msn/MsnProtocolProviderServiceLick.java
index af59321..24bd012 100644
--- a/test/net/java/sip/communicator/slick/protocol/msn/MsnProtocolProviderServiceLick.java
+++ b/test/net/java/sip/communicator/slick/protocol/msn/MsnProtocolProviderServiceLick.java
@@ -8,9 +8,10 @@ package net.java.sip.communicator.slick.protocol.msn;
 
 import java.util.*;
 
-import org.osgi.framework.*;
 import junit.framework.*;
 
+import org.osgi.framework.*;
+
 /**
  * Msn specific testing for a Msn Protocol Provider Service implementation.
  * The test suite registers three accounts for
diff --git a/test/net/java/sip/communicator/slick/protocol/msn/MsnSlickFixture.java b/test/net/java/sip/communicator/slick/protocol/msn/MsnSlickFixture.java
index f37813e..12b61db 100644
--- a/test/net/java/sip/communicator/slick/protocol/msn/MsnSlickFixture.java
+++ b/test/net/java/sip/communicator/slick/protocol/msn/MsnSlickFixture.java
@@ -6,11 +6,11 @@
  */
 package net.java.sip.communicator.slick.protocol.msn;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.slick.protocol.generic.*;
 
+import org.osgi.framework.*;
+
 /**
  * Contains fields and methods used by most or all tests in the msn slick.
  *
diff --git a/test/net/java/sip/communicator/slick/protocol/msn/TestAccountInstallation.java b/test/net/java/sip/communicator/slick/protocol/msn/TestAccountInstallation.java
index 7fc5085..b02d8e0 100644
--- a/test/net/java/sip/communicator/slick/protocol/msn/TestAccountInstallation.java
+++ b/test/net/java/sip/communicator/slick/protocol/msn/TestAccountInstallation.java
@@ -8,10 +8,11 @@ package net.java.sip.communicator.slick.protocol.msn;
 
 import java.util.*;
 
-import org.osgi.framework.*;
 import junit.framework.*;
 import net.java.sip.communicator.service.protocol.*;
 
+import org.osgi.framework.*;
+
 public class TestAccountInstallation
     extends TestCase
 {
diff --git a/test/net/java/sip/communicator/slick/protocol/msn/TestAccountUninstallation.java b/test/net/java/sip/communicator/slick/protocol/msn/TestAccountUninstallation.java
index 18d4d71..7df766d 100644
--- a/test/net/java/sip/communicator/slick/protocol/msn/TestAccountUninstallation.java
+++ b/test/net/java/sip/communicator/slick/protocol/msn/TestAccountUninstallation.java
@@ -6,10 +6,11 @@
  */
 package net.java.sip.communicator.slick.protocol.msn;
 
-import org.osgi.framework.*;
 import junit.framework.*;
 import net.java.sip.communicator.service.protocol.*;
 
+import org.osgi.framework.*;
+
 /**
  * Tests whether accounts are uninstalled properly. It is important that
  * tests from this class be called last since they will install the accounts
diff --git a/test/net/java/sip/communicator/slick/protocol/msn/TestAccountUninstallationPersistence.java b/test/net/java/sip/communicator/slick/protocol/msn/TestAccountUninstallationPersistence.java
index b3f1e7f..bb46946 100644
--- a/test/net/java/sip/communicator/slick/protocol/msn/TestAccountUninstallationPersistence.java
+++ b/test/net/java/sip/communicator/slick/protocol/msn/TestAccountUninstallationPersistence.java
@@ -6,11 +6,12 @@
  */
 package net.java.sip.communicator.slick.protocol.msn;
 
-import org.osgi.framework.*;
 import junit.framework.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.protocol.*;
 
+import org.jitsi.service.configuration.*;
+import org.osgi.framework.*;
+
 /**
  * Contains tests verifying persistence of account uninstallation. In other
  * words we try to make sure that once uninstalled an account remains
diff --git a/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetAdHocMultiUserChatMsnImpl.java b/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetAdHocMultiUserChatMsnImpl.java
index a0fca2e..590fb26 100644
--- a/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetAdHocMultiUserChatMsnImpl.java
+++ b/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetAdHocMultiUserChatMsnImpl.java
@@ -9,9 +9,7 @@ package net.java.sip.communicator.slick.protocol.msn;
 import java.util.*;
 
 import junit.framework.*;
-
 import net.java.sip.communicator.service.protocol.*;
-
 import net.java.sip.communicator.slick.protocol.generic.*;
 
 /**
diff --git a/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetFileTransferImpl.java b/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetFileTransferImpl.java
index d4c2d9c..9d39107 100644
--- a/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetFileTransferImpl.java
+++ b/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetFileTransferImpl.java
@@ -7,9 +7,11 @@
 package net.java.sip.communicator.slick.protocol.msn;
 
 import java.util.*;
+
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.slick.protocol.generic.*;
 import net.java.sip.communicator.util.*;
+
 import org.osgi.framework.*;
 
 /**
diff --git a/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetInstantMessageTransformMsnImpl.java b/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetInstantMessageTransformMsnImpl.java
index fd3fe45..095e47a 100644
--- a/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetInstantMessageTransformMsnImpl.java
+++ b/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetInstantMessageTransformMsnImpl.java
@@ -2,11 +2,11 @@ package net.java.sip.communicator.slick.protocol.msn;
 
 import java.util.*;
 
+import junit.framework.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.slick.protocol.generic.*;
 import net.java.sip.communicator.util.*;
-import junit.framework.*;
 
 public class TestOperationSetInstantMessageTransformMsnImpl
     extends TestCase
diff --git a/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetPresence.java b/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetPresence.java
index a272efc..9f183d2 100644
--- a/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetPresence.java
+++ b/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetPresence.java
@@ -6,7 +6,7 @@
  */
 package net.java.sip.communicator.slick.protocol.msn;
 
-import java.beans.PropertyChangeEvent;
+import java.beans.*;
 import java.util.*;
 
 import junit.framework.*;
diff --git a/test/net/java/sip/communicator/slick/protocol/msn/TestProtocolProviderServiceMsnImpl.java b/test/net/java/sip/communicator/slick/protocol/msn/TestProtocolProviderServiceMsnImpl.java
index 612e148..4f28ad1 100644
--- a/test/net/java/sip/communicator/slick/protocol/msn/TestProtocolProviderServiceMsnImpl.java
+++ b/test/net/java/sip/communicator/slick/protocol/msn/TestProtocolProviderServiceMsnImpl.java
@@ -9,7 +9,6 @@ package net.java.sip.communicator.slick.protocol.msn;
 import java.util.*;
 
 import junit.framework.*;
-
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.slick.protocol.generic.*;
diff --git a/test/net/java/sip/communicator/slick/protocol/rss/RssProtocolProviderServiceLick.java b/test/net/java/sip/communicator/slick/protocol/rss/RssProtocolProviderServiceLick.java
index 89c130e..788388b 100755
--- a/test/net/java/sip/communicator/slick/protocol/rss/RssProtocolProviderServiceLick.java
+++ b/test/net/java/sip/communicator/slick/protocol/rss/RssProtocolProviderServiceLick.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.slick.protocol.rss;
 
 import java.util.*;
+
 import junit.framework.*;
 import net.java.sip.communicator.util.*;
 
diff --git a/test/net/java/sip/communicator/slick/protocol/rss/RssSlickFixture.java b/test/net/java/sip/communicator/slick/protocol/rss/RssSlickFixture.java
index 4cbe8de..cd75d41 100755
--- a/test/net/java/sip/communicator/slick/protocol/rss/RssSlickFixture.java
+++ b/test/net/java/sip/communicator/slick/protocol/rss/RssSlickFixture.java
@@ -7,11 +7,12 @@
 package net.java.sip.communicator.slick.protocol.rss;
 
 import java.util.*;
-import junit.framework.*;
-import org.osgi.framework.*;
 
+import junit.framework.*;
 import net.java.sip.communicator.service.protocol.*;
 
+import org.osgi.framework.*;
+
 /**
  * Contains constants and methods used by almost all of our tests.
  *
diff --git a/test/net/java/sip/communicator/slick/protocol/rss/TestAccountInstallation.java b/test/net/java/sip/communicator/slick/protocol/rss/TestAccountInstallation.java
index 547720d..d59fada 100755
--- a/test/net/java/sip/communicator/slick/protocol/rss/TestAccountInstallation.java
+++ b/test/net/java/sip/communicator/slick/protocol/rss/TestAccountInstallation.java
@@ -6,11 +6,13 @@
  */
 package net.java.sip.communicator.slick.protocol.rss;
 
-import org.osgi.framework.*;
-import net.java.sip.communicator.service.protocol.*;
-import junit.framework.*;
 import java.util.*;
 
+import junit.framework.*;
+import net.java.sip.communicator.service.protocol.*;
+
+import org.osgi.framework.*;
+
 /**
  * Installs a test account and verifies it is available after installation.
  *
diff --git a/test/net/java/sip/communicator/slick/protocol/rss/TestAccountUninstallation.java b/test/net/java/sip/communicator/slick/protocol/rss/TestAccountUninstallation.java
index 9e32414..b870448 100755
--- a/test/net/java/sip/communicator/slick/protocol/rss/TestAccountUninstallation.java
+++ b/test/net/java/sip/communicator/slick/protocol/rss/TestAccountUninstallation.java
@@ -7,9 +7,10 @@
 package net.java.sip.communicator.slick.protocol.rss;
 
 import junit.framework.*;
-import org.osgi.framework.*;
 import net.java.sip.communicator.service.protocol.*;
 
+import org.osgi.framework.*;
+
 /**
  * Tests whether accounts are uninstalled properly. It is important that
  * tests from this class be called last since they will install the accounts
diff --git a/test/net/java/sip/communicator/slick/protocol/rss/TestAccountUninstallationPersistence.java b/test/net/java/sip/communicator/slick/protocol/rss/TestAccountUninstallationPersistence.java
index 743b378..d84b684 100755
--- a/test/net/java/sip/communicator/slick/protocol/rss/TestAccountUninstallationPersistence.java
+++ b/test/net/java/sip/communicator/slick/protocol/rss/TestAccountUninstallationPersistence.java
@@ -7,10 +7,11 @@
 package net.java.sip.communicator.slick.protocol.rss;
 
 import junit.framework.*;
-import org.osgi.framework.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.protocol.*;
 
+import org.jitsi.service.configuration.*;
+import org.osgi.framework.*;
+
 /**
  * Contains tests verifying persistence of account uninstallation. In other
  * words we try to make sure that once uninstalled an account remains
diff --git a/test/net/java/sip/communicator/slick/protocol/rss/TestProtocolProviderServiceRssImpl.java b/test/net/java/sip/communicator/slick/protocol/rss/TestProtocolProviderServiceRssImpl.java
index 5bbabed..1d47cc1 100755
--- a/test/net/java/sip/communicator/slick/protocol/rss/TestProtocolProviderServiceRssImpl.java
+++ b/test/net/java/sip/communicator/slick/protocol/rss/TestProtocolProviderServiceRssImpl.java
@@ -6,11 +6,12 @@
  */
 package net.java.sip.communicator.slick.protocol.rss;
 
+import java.util.*;
+
 import junit.framework.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
-import java.util.*;
 
 /**
  * This class performs testing on protocol provider methods. It verifies that
diff --git a/test/net/java/sip/communicator/slick/protocol/rss/TestingServer.java b/test/net/java/sip/communicator/slick/protocol/rss/TestingServer.java
index c49e231..9017de7 100755
--- a/test/net/java/sip/communicator/slick/protocol/rss/TestingServer.java
+++ b/test/net/java/sip/communicator/slick/protocol/rss/TestingServer.java
@@ -6,8 +6,8 @@
  */
 package net.java.sip.communicator.slick.protocol.rss;
 
-import java.net.*;
 import java.io.*;
+import java.net.*;
 
 /**
  * This classed is used in the automatic testing of the RSS protocol. It acts as
diff --git a/test/net/java/sip/communicator/slick/protocol/rss/TestingServerThread.java b/test/net/java/sip/communicator/slick/protocol/rss/TestingServerThread.java
index 40947a8..03456b6 100755
--- a/test/net/java/sip/communicator/slick/protocol/rss/TestingServerThread.java
+++ b/test/net/java/sip/communicator/slick/protocol/rss/TestingServerThread.java
@@ -6,10 +6,10 @@
  */
 package net.java.sip.communicator.slick.protocol.rss;
 
-import java.net.*;
 import java.io.*;
-import java.util.*;
+import java.net.*;
 import java.text.*;
+import java.util.*;
 
 /**
  * This class represents the separate thread that a <code>TestingServer</code>
diff --git a/test/net/java/sip/communicator/slick/protocol/sip/SipProtocolProviderServiceLick.java b/test/net/java/sip/communicator/slick/protocol/sip/SipProtocolProviderServiceLick.java
index 4e07318..a046f99 100644
--- a/test/net/java/sip/communicator/slick/protocol/sip/SipProtocolProviderServiceLick.java
+++ b/test/net/java/sip/communicator/slick/protocol/sip/SipProtocolProviderServiceLick.java
@@ -8,9 +8,10 @@ package net.java.sip.communicator.slick.protocol.sip;
 
 import java.util.*;
 
-import org.osgi.framework.*;
 import junit.framework.*;
 
+import org.osgi.framework.*;
+
 /**
  * SIP specific testing for a SIP Protocol Provider Service implementation.
  * The test suite registers two accounts for
diff --git a/test/net/java/sip/communicator/slick/protocol/sip/SipSlickFixture.java b/test/net/java/sip/communicator/slick/protocol/sip/SipSlickFixture.java
index 7cee202..7555a8f 100644
--- a/test/net/java/sip/communicator/slick/protocol/sip/SipSlickFixture.java
+++ b/test/net/java/sip/communicator/slick/protocol/sip/SipSlickFixture.java
@@ -8,10 +8,11 @@ package net.java.sip.communicator.slick.protocol.sip;
 
 import java.util.*;
 
-import org.osgi.framework.*;
 import junit.framework.*;
 import net.java.sip.communicator.service.protocol.*;
 
+import org.osgi.framework.*;
+
 /**
  * Contains fields and methods used by most or all tests in the SIP slick.
  */
diff --git a/test/net/java/sip/communicator/slick/protocol/sip/TestAccountInstallation.java b/test/net/java/sip/communicator/slick/protocol/sip/TestAccountInstallation.java
index 7c2e5b5..4dc9fc3 100644
--- a/test/net/java/sip/communicator/slick/protocol/sip/TestAccountInstallation.java
+++ b/test/net/java/sip/communicator/slick/protocol/sip/TestAccountInstallation.java
@@ -6,12 +6,13 @@
  */
 package net.java.sip.communicator.slick.protocol.sip;
 
+import java.util.*;
+
 import junit.framework.*;
 import net.java.sip.communicator.impl.protocol.sip.*;
 import net.java.sip.communicator.service.protocol.*;
-import org.osgi.framework.*;
 
-import java.util.*;
+import org.osgi.framework.*;
 
 public class TestAccountInstallation
     extends TestCase
diff --git a/test/net/java/sip/communicator/slick/protocol/sip/TestAccountUninstallation.java b/test/net/java/sip/communicator/slick/protocol/sip/TestAccountUninstallation.java
index fee5e9d..defd4e4 100644
--- a/test/net/java/sip/communicator/slick/protocol/sip/TestAccountUninstallation.java
+++ b/test/net/java/sip/communicator/slick/protocol/sip/TestAccountUninstallation.java
@@ -6,13 +6,14 @@
  */
 package net.java.sip.communicator.slick.protocol.sip;
 
-import org.osgi.framework.*;
+import java.util.*;
+
 import junit.framework.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.util.*;
-import java.util.List;
-import java.util.LinkedList;
 import net.java.sip.communicator.service.protocol.event.*;
+import net.java.sip.communicator.util.*;
+
+import org.osgi.framework.*;
 
 /**
  * Tests whether accaounts are uninstalled properly. It is important that
diff --git a/test/net/java/sip/communicator/slick/protocol/sip/TestAccountUninstallationPersistence.java b/test/net/java/sip/communicator/slick/protocol/sip/TestAccountUninstallationPersistence.java
index 680a775..ac0b49f 100644
--- a/test/net/java/sip/communicator/slick/protocol/sip/TestAccountUninstallationPersistence.java
+++ b/test/net/java/sip/communicator/slick/protocol/sip/TestAccountUninstallationPersistence.java
@@ -6,11 +6,12 @@
  */
 package net.java.sip.communicator.slick.protocol.sip;
 
-import org.osgi.framework.*;
 import junit.framework.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.protocol.*;
 
+import org.jitsi.service.configuration.*;
+import org.osgi.framework.*;
+
 /**
  * Contains tests verifying persistence of account uninstallation. In other
  * words we try to make sure that once uninstalled an account remains
diff --git a/test/net/java/sip/communicator/slick/protocol/sip/TestAutoProxyDetection.java b/test/net/java/sip/communicator/slick/protocol/sip/TestAutoProxyDetection.java
index 06cb70d..824bb60 100644
--- a/test/net/java/sip/communicator/slick/protocol/sip/TestAutoProxyDetection.java
+++ b/test/net/java/sip/communicator/slick/protocol/sip/TestAutoProxyDetection.java
@@ -6,19 +6,20 @@
  */

 package net.java.sip.communicator.slick.protocol.sip;

 

-import static org.easymock.EasyMock.*;

-

-import java.net.InetAddress;

-import java.net.InetSocketAddress;

-import java.net.UnknownHostException;

-import java.text.ParseException;

-

-import net.java.sip.communicator.impl.protocol.sip.SipAccountID;

-import net.java.sip.communicator.impl.protocol.sip.net.AutoProxyConnection;

-import net.java.sip.communicator.util.SRVRecord;

-import net.java.sip.communicator.util.dns.DnssecException;

-import static net.java.sip.communicator.service.protocol.ProtocolProviderFactory.*;

-import junit.framework.TestCase;

+import static net.java.sip.communicator.service.protocol.ProtocolProviderFactory.USER_ID;

+import static org.easymock.EasyMock.createMock;

+import static org.easymock.EasyMock.expect;

+import static org.easymock.EasyMock.replay;

+import static org.easymock.EasyMock.verify;

+

+import java.net.*;

+import java.text.*;

+

+import junit.framework.*;

+import net.java.sip.communicator.impl.protocol.sip.*;

+import net.java.sip.communicator.impl.protocol.sip.net.*;

+import net.java.sip.communicator.util.*;

+import net.java.sip.communicator.util.dns.*;

 

 /**

  * Tests all variations of automatic proxy detection through (simulated) DNS.

diff --git a/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetBasicInstantMessaging.java b/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetBasicInstantMessaging.java
index e9c8106..4d65f6c 100644
--- a/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetBasicInstantMessaging.java
+++ b/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetBasicInstantMessaging.java
@@ -6,9 +6,9 @@
  */
 package net.java.sip.communicator.slick.protocol.sip;
 
+import java.io.*;
 import java.net.*;
 import java.util.*;
-import java.io.*;
 
 import junit.framework.*;
 import net.java.sip.communicator.service.protocol.*;
diff --git a/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetBasicTelephonySipImpl.java b/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetBasicTelephonySipImpl.java
index ff1a094..8956f9a 100644
--- a/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetBasicTelephonySipImpl.java
+++ b/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetBasicTelephonySipImpl.java
@@ -6,12 +6,13 @@
  */
 package net.java.sip.communicator.slick.protocol.sip;
 
+import java.text.*;
+import java.util.*;
+
 import junit.framework.*;
-import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.service.protocol.*;
-import java.text.*;
 import net.java.sip.communicator.service.protocol.event.*;
-import java.util.*;
+import net.java.sip.communicator.util.*;
 
 /**
  * Tests Basic telephony functionality by making one provider call the other.
diff --git a/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetPresence.java b/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetPresence.java
index 1fe4f26..13b046e 100644
--- a/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetPresence.java
+++ b/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetPresence.java
@@ -6,11 +6,10 @@
  */
 package net.java.sip.communicator.slick.protocol.sip;
 
-import java.beans.PropertyChangeEvent;
+import java.beans.*;
 import java.util.*;
 
 import junit.framework.*;
-
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
diff --git a/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetServerStoredInfo.java b/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetServerStoredInfo.java
index 646f8fb..4647862 100644
--- a/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetServerStoredInfo.java
+++ b/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetServerStoredInfo.java
@@ -7,15 +7,16 @@
 package net.java.sip.communicator.slick.protocol.sip;
 
 import gov.nist.javax.sip.address.*;
+
+import java.net.*;
+import java.util.*;
+
 import junit.framework.*;
-import net.java.sip.communicator.util.*;
-import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.impl.protocol.sip.*;
 import net.java.sip.communicator.impl.protocol.sip.xcap.*;
 import net.java.sip.communicator.impl.protocol.sip.xcap.model.prescontent.*;
-
-import java.net.URI;
-import java.util.*;
+import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.util.*;
 
 /**
  * Testing of the user and account info. Tests for reading, adding, removing,
diff --git a/test/net/java/sip/communicator/slick/protocol/sip/TestXCapParse.java b/test/net/java/sip/communicator/slick/protocol/sip/TestXCapParse.java
index e5cb070..5ad0987 100644
--- a/test/net/java/sip/communicator/slick/protocol/sip/TestXCapParse.java
+++ b/test/net/java/sip/communicator/slick/protocol/sip/TestXCapParse.java
@@ -6,8 +6,9 @@
  */
 package net.java.sip.communicator.slick.protocol.sip;
 
-import junit.framework.*;
+import javax.xml.namespace.*;
 
+import junit.framework.*;
 import net.java.sip.communicator.impl.protocol.sip.xcap.model.commonpolicy.*;
 import net.java.sip.communicator.impl.protocol.sip.xcap.model.prescontent.*;
 import net.java.sip.communicator.impl.protocol.sip.xcap.model.presrules.*;
@@ -15,9 +16,8 @@ import net.java.sip.communicator.impl.protocol.sip.xcap.model.resourcelists.*;
 import net.java.sip.communicator.impl.protocol.sip.xcap.model.xcapcaps.*;
 import net.java.sip.communicator.impl.protocol.sip.xcap.model.xcaperror.*;
 import net.java.sip.communicator.util.xml.*;
-import org.w3c.dom.*;
 
-import javax.xml.namespace.*;
+import org.w3c.dom.*;
 
 /**
  * Contains tests of parsing xcap-caps, resource-lists, pres-content,
diff --git a/test/net/java/sip/communicator/slick/protocol/yahoo/TestAccountInstallation.java b/test/net/java/sip/communicator/slick/protocol/yahoo/TestAccountInstallation.java
index d6a5ff5..08ad13a 100644
--- a/test/net/java/sip/communicator/slick/protocol/yahoo/TestAccountInstallation.java
+++ b/test/net/java/sip/communicator/slick/protocol/yahoo/TestAccountInstallation.java
@@ -8,10 +8,11 @@ package net.java.sip.communicator.slick.protocol.yahoo;
 
 import java.util.*;
 
-import org.osgi.framework.*;
 import junit.framework.*;
 import net.java.sip.communicator.service.protocol.*;
 
+import org.osgi.framework.*;
+
 public class TestAccountInstallation
     extends TestCase
 {
diff --git a/test/net/java/sip/communicator/slick/protocol/yahoo/TestAccountUninstallation.java b/test/net/java/sip/communicator/slick/protocol/yahoo/TestAccountUninstallation.java
index e618f16..4e9ea05 100644
--- a/test/net/java/sip/communicator/slick/protocol/yahoo/TestAccountUninstallation.java
+++ b/test/net/java/sip/communicator/slick/protocol/yahoo/TestAccountUninstallation.java
@@ -6,10 +6,11 @@
  */
 package net.java.sip.communicator.slick.protocol.yahoo;
 
-import org.osgi.framework.*;
 import junit.framework.*;
 import net.java.sip.communicator.service.protocol.*;
 
+import org.osgi.framework.*;
+
 /**
  * Tests whether accounts are uninstalled properly. It is important that
  * tests from this class be called last since they will install the accounts
diff --git a/test/net/java/sip/communicator/slick/protocol/yahoo/TestAccountUninstallationPersistence.java b/test/net/java/sip/communicator/slick/protocol/yahoo/TestAccountUninstallationPersistence.java
index 8aec8ca..335b264 100644
--- a/test/net/java/sip/communicator/slick/protocol/yahoo/TestAccountUninstallationPersistence.java
+++ b/test/net/java/sip/communicator/slick/protocol/yahoo/TestAccountUninstallationPersistence.java
@@ -6,11 +6,12 @@
  */
 package net.java.sip.communicator.slick.protocol.yahoo;
 
-import org.osgi.framework.*;
 import junit.framework.*;
-import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.protocol.*;
 
+import org.jitsi.service.configuration.*;
+import org.osgi.framework.*;
+
 /**
  * Contains tests verifying persistence of account uninstallation. In other
  * words we try to make sure that once uninstalled an account remains
diff --git a/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetAdHocMultiUserChatYahooImpl.java b/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetAdHocMultiUserChatYahooImpl.java
index c18f2ad..c8b40bb 100644
--- a/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetAdHocMultiUserChatYahooImpl.java
+++ b/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetAdHocMultiUserChatYahooImpl.java
@@ -9,7 +9,6 @@ package net.java.sip.communicator.slick.protocol.yahoo;
 import java.util.*;
 
 import junit.framework.*;
-
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.slick.protocol.generic.*;
 
diff --git a/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetFileTransferImpl.java b/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetFileTransferImpl.java
index d1f6bbb..166f358 100644
--- a/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetFileTransferImpl.java
+++ b/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetFileTransferImpl.java
@@ -7,9 +7,11 @@
 package net.java.sip.communicator.slick.protocol.yahoo;
 
 import java.util.*;
+
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.slick.protocol.generic.*;
 import net.java.sip.communicator.util.*;
+
 import org.osgi.framework.*;
 
 /**
diff --git a/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPresence.java b/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPresence.java
index 07857ba..029e3d1 100644
--- a/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPresence.java
+++ b/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPresence.java
@@ -6,7 +6,7 @@
  */
 package net.java.sip.communicator.slick.protocol.yahoo;
 
-import java.beans.PropertyChangeEvent;
+import java.beans.*;
 import java.util.*;
 
 import junit.framework.*;
diff --git a/test/net/java/sip/communicator/slick/protocol/yahoo/YahooProtocolProviderServiceLick.java b/test/net/java/sip/communicator/slick/protocol/yahoo/YahooProtocolProviderServiceLick.java
index a95536f..029925a 100644
--- a/test/net/java/sip/communicator/slick/protocol/yahoo/YahooProtocolProviderServiceLick.java
+++ b/test/net/java/sip/communicator/slick/protocol/yahoo/YahooProtocolProviderServiceLick.java
@@ -8,9 +8,10 @@ package net.java.sip.communicator.slick.protocol.yahoo;
 
 import java.util.*;
 
-import org.osgi.framework.*;
 import junit.framework.*;
 
+import org.osgi.framework.*;
+
 /**
  * Yahoo specific testing for a Yahoo Protocol Provider Service implementation.
  * The test suite registers three accounts for
diff --git a/test/net/java/sip/communicator/slick/protocol/yahoo/YahooSlickFixture.java b/test/net/java/sip/communicator/slick/protocol/yahoo/YahooSlickFixture.java
index 2cb9f4b..8d12dec 100644
--- a/test/net/java/sip/communicator/slick/protocol/yahoo/YahooSlickFixture.java
+++ b/test/net/java/sip/communicator/slick/protocol/yahoo/YahooSlickFixture.java
@@ -6,11 +6,11 @@
  */
 package net.java.sip.communicator.slick.protocol.yahoo;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.slick.protocol.generic.*;
 
+import org.osgi.framework.*;
+
 /**
  * Contains fields and methods used by most or all tests in the yahoo slick.
  *
diff --git a/test/net/java/sip/communicator/slick/runner/SipCommunicatorSlickRunner.java b/test/net/java/sip/communicator/slick/runner/SipCommunicatorSlickRunner.java
index d523ab3..57fbfe7 100644
--- a/test/net/java/sip/communicator/slick/runner/SipCommunicatorSlickRunner.java
+++ b/test/net/java/sip/communicator/slick/runner/SipCommunicatorSlickRunner.java
@@ -3,10 +3,11 @@ package net.java.sip.communicator.slick.runner;
 import java.io.*;
 import java.util.*;
 
-import org.osgi.framework.*;
 import junit.framework.*;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * Detects and runs all Service Implementation Compatibility Kits (SLICKs)inside
  * the current OSGI instance. The SipCommunicatorSlickRunner produces an xml log
diff --git a/test/net/java/sip/communicator/slick/runner/XmlFormatter.java b/test/net/java/sip/communicator/slick/runner/XmlFormatter.java
index f265a37..5577375 100644
--- a/test/net/java/sip/communicator/slick/runner/XmlFormatter.java
+++ b/test/net/java/sip/communicator/slick/runner/XmlFormatter.java
@@ -27,13 +27,15 @@ package net.java.sip.communicator.slick.runner;
 
 import java.io.*;
 import java.util.*;
+
 import javax.xml.parsers.*;
 
-import org.w3c.dom.*;
 import junit.framework.*;
 import junit.textui.*;
 import net.java.sip.communicator.util.xml.*;
 
+import org.w3c.dom.*;
+
 
 /**
  * Prints XML output of the test to a specified Writer.
diff --git a/test/net/java/sip/communicator/slick/slickless/SlicklessTests.java b/test/net/java/sip/communicator/slick/slickless/SlicklessTests.java
index 723ced7..6c19767 100644
--- a/test/net/java/sip/communicator/slick/slickless/SlicklessTests.java
+++ b/test/net/java/sip/communicator/slick/slickless/SlicklessTests.java
@@ -8,12 +8,11 @@ package net.java.sip.communicator.slick.slickless;
 
 import java.util.*;
 
-import org.osgi.framework.*;
-
 import junit.framework.*;
-
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 
 /**
  * Runs all unit tests that do not belong to any SLICK.
diff --git a/test/net/java/sip/communicator/slick/slickless/util/xml/TestXMLUtils.java b/test/net/java/sip/communicator/slick/slickless/util/xml/TestXMLUtils.java
index fcbf958..6068a2c 100644
--- a/test/net/java/sip/communicator/slick/slickless/util/xml/TestXMLUtils.java
+++ b/test/net/java/sip/communicator/slick/slickless/util/xml/TestXMLUtils.java
@@ -7,13 +7,15 @@
 package net.java.sip.communicator.slick.slickless.util.xml;
 
 import java.io.*;
+
 import javax.xml.parsers.*;
 import javax.xml.transform.stream.*;
 
-import org.w3c.dom.*;
 import junit.framework.*;
 import net.java.sip.communicator.util.xml.*;
 
+import org.w3c.dom.*;
+
 
 /**
  * JUnit tests for the TestXMLUtils package.