Fixes warnings, spelling mistakes.

src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java

@@ -19,7 +19,6 @@
 import net.java.sip.communicator.impl.gui.main.call.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
-import net.java.sip.communicator.impl.gui.main.chat.history.*;
 import net.java.sip.communicator.impl.gui.main.configforms.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.contactsource.*;

src/net/java/sip/communicator/impl/protocol/sip/OperationSetTelephonyConferencingSipImpl.java

@@ -6,6 +6,8 @@
  */
 package net.java.sip.communicator.impl.protocol.sip;
 
+import gov.nist.javax.sip.header.*;
+
 import java.io.*;
 import java.text.*;
 import java.util.*;
@@ -16,12 +18,12 @@
 import javax.sip.message.*;
 import javax.sip.message.Message;
 
-import gov.nist.javax.sip.header.*;
 import net.java.sip.communicator.impl.protocol.sip.sdp.*;
 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.*;
+
 import org.jitsi.util.xml.*;
 
 /**

src/net/java/sip/communicator/impl/protocol/sip/sdp/SdpUtils.java

@@ -28,7 +28,7 @@
  * creating and parsing SDP descriptions.
  *
  * @author Emil Ivov
- * @author Lubomir Marinov
+ * @author Lyubomir Marinov
  */
 public class SdpUtils
 {
@@ -1564,13 +1564,14 @@ public static MediaType getMediaType(MediaDescription description)
         {
             return MediaType.parseString(description.getMedia().getMediaType());
         }
-        catch (SdpException exc)
+        catch (SdpException e)
         {
             // impossible to happen for reasons mentioned many times here :)
+            String message = "Invalid media type in m= line: " + description;
+
             if (logger.isDebugEnabled())
-                logger.debug("Invalid media type in m= line: " + description, exc);
-            throw new IllegalArgumentException(
-                         "Invalid media type in m= line: " + description, exc);
+                logger.debug(message, e);
+            throw new IllegalArgumentException(message, e);
         }
     }
 
@@ -1590,24 +1591,27 @@ public static MediaType getMediaType(MediaDescription description)
     @SuppressWarnings("unchecked") // legacy jain-sdp code
     public static boolean containsAttribute(MediaDescription description,
                                             String attributeName)
-        throws  IllegalArgumentException
+        throws IllegalArgumentException
     {
         try
         {
             Vector<Attribute> atts = description.getAttributes(false);
+
             for(Attribute a : atts)
+            {
                 if(a.getName().equals(attributeName))
                     return true;
-
+            }
             return false;
         }
-        catch (SdpException exc)
+        catch (SdpException e)
         {
             // impossible to happen for reasons mentioned many times here :)
+            String message = "Invalid media type in a= line: " + description;
+
             if (logger.isDebugEnabled())
-                logger.debug("Invalid media type in a= line: " + description, exc);
-            throw new IllegalArgumentException(
-                         "Invalid media type in a= line: " + description, exc);
+                logger.debug(message, e);
+            throw new IllegalArgumentException(message, e);
         }
     }
 
@@ -1653,8 +1657,9 @@ public static MediaDescription createDisablingAnswer(
         }
         catch (Exception e)
         {
-            throw new IllegalArgumentException("Could not create a disabling " +
-                    "answer", e);
+            throw new IllegalArgumentException(
+                    "Could not create a disabling answer",
+                    e);
         }
     }
 
@@ -1690,7 +1695,7 @@ public static Vector<MediaDescription> extractMediaDescriptions(
         if(remoteDescriptions == null || remoteDescriptions.size() == 0)
         {
             throw new IllegalArgumentException(
-                "Could not find any media descriptions.");
+                    "Could not find any media descriptions.");
         }
 
         return remoteDescriptions;
@@ -1727,8 +1732,7 @@ public static String getContentAsString(javax.sip.message.Message message)
         }
         catch (UnsupportedEncodingException uee)
         {
-            logger
-                .warn(
+            logger.warn(
                     "SIP message with unsupported charset of its content",
                     uee);
 

src/net/java/sip/communicator/plugin/spellcheck/LanguageMenuBar.java

@@ -15,15 +15,14 @@
 import javax.swing.*;
 import javax.swing.event.*;
 
+import net.java.sip.communicator.plugin.desktoputil.*;
+import net.java.sip.communicator.plugin.desktoputil.SwingWorker;
 import net.java.sip.communicator.plugin.spellcheck.Parameters.Default;
 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.*;
 import net.java.sip.communicator.util.*;
-import net.java.sip.communicator.plugin.desktoputil.*;
-import net.java.sip.communicator.plugin.desktoputil.SwingWorker;
 
 /**
  * Combo box providing a listing of all available locales with corresponding

src/net/java/sip/communicator/service/protocol/AccountID.java

@@ -775,9 +775,9 @@ public List<String> getSortedEnabledEncryptionProtocolList()
                     true);
         Map<String, Boolean> encryptionProtocolStatus
             = getBooleanPropertiesByPrefix(
-                ProtocolProviderFactory.ENCRYPTION_PROTOCOL_STATUS,
-                true,
-                false);
+                    ProtocolProviderFactory.ENCRYPTION_PROTOCOL_STATUS,
+                    true,
+                    false);
 
         // If the account is not yet configured, then ZRTP is activated by
         // default.
@@ -812,7 +812,7 @@ public List<String> getSortedEnabledEncryptionProtocolList()
             }
         }
 
-        // Second: remove all disabled protocol.
+        // Second: remove all disabled protocols.
         int namePrefixLength
             = ProtocolProviderFactory.ENCRYPTION_PROTOCOL.length() + 1;
 

src/net/java/sip/communicator/util/ConfigurationUtils.java

@@ -10,11 +10,10 @@
 import java.beans.*;
 import java.io.*;
 import java.util.*;
-import java.util.List; /* disambiguation */
+import java.util.List;
 
 import javax.net.ssl.*;
 
-import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.msghistory.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.resources.*;