9 files changed, 49 insertions, 40 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/facebook/OperationSetPersistentPresenceFacebookImpl.java b/src/net/java/sip/communicator/impl/protocol/facebook/OperationSetPersistentPresenceFacebookImpl.java
index 1f66784..54f48b2 100644
--- a/src/net/java/sip/communicator/impl/protocol/facebook/OperationSetPersistentPresenceFacebookImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/facebook/OperationSetPersistentPresenceFacebookImpl.java
@@ -654,9 +654,8 @@ public class OperationSetPersistentPresenceFacebookImpl
         if (fbProvider != null)
         {
             OperationSetPersistentPresence opSetPresence
-                = (OperationSetPersistentPresence)
-                    fbProvider
-                        .getOperationSet(OperationSetPersistentPresence.class);
+                = fbProvider
+                    .getOperationSet(OperationSetPersistentPresence.class);
 
             changePresenceStatusForContact(contact,
                 (FacebookStatusEnum) opSetPresence.getPresenceStatus());
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 280a8a9..4a19a92 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetBasicInstantMessagingIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetBasicInstantMessagingIcqImpl.java
@@ -392,9 +392,11 @@ public class OperationSetBasicInstantMessagingIcqImpl
                 icqProvider.getAimConnection().getIcbmService()
                     .addIcbmListener(joustSimIcbmListener);
 
-                opSetPersPresence =
-                    (OperationSetPersistentPresenceIcqImpl) icqProvider
-                        .getOperationSet(OperationSetPersistentPresence.class);
+                opSetPersPresence
+                    = (OperationSetPersistentPresenceIcqImpl)
+                        icqProvider
+                            .getOperationSet(
+                                OperationSetPersistentPresence.class);
             }
             else if (evt.getNewState() == RegistrationState.REGISTERED)
             {
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 b6ba91f..412559c 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomJabberImpl.java
@@ -1495,19 +1495,21 @@ public class ChatRoomJabberImpl
             if(!(packet instanceof org.jivesoftware.smack.packet.Message))
                 return;
 
-            org.jivesoftware.smack.packet.Message msg =
-                (org.jivesoftware.smack.packet.Message)packet;
+            org.jivesoftware.smack.packet.Message msg
+                = (org.jivesoftware.smack.packet.Message) packet;
+            String msgBody = msg.getBody();
 
-            if(msg.getBody() == null)
+            if(msgBody == null)
                 return;
 
-            String fromUserName = StringUtils.parseResource(msg.getFrom());
-            
+            String msgFrom = msg.getFrom();
+            String fromUserName = StringUtils.parseResource(msgFrom);
+
             if(fromUserName.equals(nickname))
                 return;
-            
-            ChatRoomMember member = smackParticipantToScMember(msg.getFrom());
-            
+
+            ChatRoomMember member = smackParticipantToScMember(msgFrom);
+
             if(logger.isDebugEnabled())
             {
                 logger.debug("Received from "
@@ -1516,7 +1518,7 @@ public class ChatRoomJabberImpl
                              + msg.toXML());
             }
 
-            Message newMessage = createMessage(msg.getBody());
+            Message newMessage = createMessage(msgBody);
 
             if(msg.getType() == org.jivesoftware.smack.packet.Message.Type.error)
             {
@@ -1545,11 +1547,11 @@ public class ChatRoomJabberImpl
                         errorResultCode,
                         new Date(),
                         newMessage);
-                
+
                 fireMessageEvent(evt);
                 return;
             }
-            
+
             ChatRoomMessageReceivedEvent msgReceivedEvt
                 = new ChatRoomMessageReceivedEvent(
                     ChatRoomJabberImpl.this,
@@ -1558,7 +1560,7 @@ public class ChatRoomJabberImpl
                     newMessage,
                     ChatRoomMessageReceivedEvent
                         .CONVERSATION_MESSAGE_RECEIVED);
-            
+
             fireMessageEvent(msgReceivedEvt);
         }
     }
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/IncomingFileTransferRequestJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/IncomingFileTransferRequestJabberImpl.java
index 6ec0eb4..5b5d9b4 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/IncomingFileTransferRequestJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/IncomingFileTransferRequestJabberImpl.java
@@ -75,8 +75,8 @@ public class IncomingFileTransferRequestJabberImpl
 
         OperationSetPersistentPresenceJabberImpl opSetPersPresence
             = (OperationSetPersistentPresenceJabberImpl)
-                jabberProvider.getOperationSet(
-                    OperationSetPersistentPresence.class);
+                jabberProvider
+                    .getOperationSet(OperationSetPersistentPresence.class);
 
         sender = opSetPersPresence.findContactByID(fromUserID);
 
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 af80068..99b5879 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
@@ -42,8 +42,9 @@ public class ProtocolProviderServiceJabberImpl
      * The name of the property that tells us whether we are supposed to start
      * experimental support for Jingle.
      */
-    private static final String PNAME_ENABLE_JINGLE = "net.java.sip"
-        + ".communicator.impl.protocol.jabber.ENABLE_EXPERIMENTAL_JINGLE";
+    private static final String PNAME_ENABLE_JINGLE
+        = "net.java.sip.communicator"
+            + ".impl.protocol.jabber.ENABLE_EXPERIMENTAL_JINGLE";
 
     /**
      * Used to connect to a XMPP server.
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 783caf9..a69a4b5 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/UriHandlerJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/UriHandlerJabberImpl.java
@@ -304,8 +304,8 @@ public class UriHandlerJabberImpl
 
         if(!uri.contains("?"))
         {
-            OperationSetPersistentPresence presenceOpSet =
-                (OperationSetPersistentPresence) provider
+            OperationSetPersistentPresence presenceOpSet
+                = provider
                     .getOperationSet(OperationSetPersistentPresence.class);
 
             String contactId = uri.replaceFirst(getProtocol() + ":", "");
@@ -353,8 +353,8 @@ public class UriHandlerJabberImpl
 
             if(param.equalsIgnoreCase("join"))
             {
-                OperationSetMultiUserChat mchatOpSet =
-                    (OperationSetMultiUserChat) provider
+                OperationSetMultiUserChat mchatOpSet
+                    = provider
                         .getOperationSet(OperationSetMultiUserChat.class);
 
                 try
@@ -374,9 +374,9 @@ public class UriHandlerJabberImpl
                             && !networkFailReceived)
                     {
                         networkFailReceived = true;
-                        OperationSetPresence presenceOpSet =
-                        (OperationSetPresence) provider
-                            .getOperationSet(OperationSetPresence.class);
+                        OperationSetPresence presenceOpSet
+                            = provider
+                                .getOperationSet(OperationSetPresence.class);
                         presenceOpSet.addProviderPresenceStatusListener(
                                 new ProviderStatusListener(uri, presenceOpSet));
                     }
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 2c61080..ccdd8f0 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/UriHandlerSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/UriHandlerSipImpl.java
@@ -296,9 +296,8 @@ public class UriHandlerSipImpl
             return;
         }
 
-        OperationSetBasicTelephony telephonyOpSet =
-            (OperationSetBasicTelephony) provider
-                .getOperationSet(OperationSetBasicTelephony.class);
+        OperationSetBasicTelephony telephonyOpSet
+            = provider.getOperationSet(OperationSetBasicTelephony.class);
 
         try
         {
diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/OperationSetBasicInstantMessagingSSHImpl.java b/src/net/java/sip/communicator/impl/protocol/ssh/OperationSetBasicInstantMessagingSSHImpl.java
index fa8f15f..e510b68 100644
--- a/src/net/java/sip/communicator/impl/protocol/ssh/OperationSetBasicInstantMessagingSSHImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/OperationSetBasicInstantMessagingSSHImpl.java
@@ -52,8 +52,10 @@ public class OperationSetBasicInstantMessagingSSHImpl
     {
         this.parentProvider = provider;
         
-        this.opSetPersPresence = (OperationSetPersistentPresenceSSHImpl)
-                provider.getOperationSet(OperationSetPersistentPresence.class);
+        this.opSetPersPresence
+                = (OperationSetPersistentPresenceSSHImpl)
+                    provider
+                        .getOperationSet(OperationSetPersistentPresence.class);
     }
 
     public Message createMessage(String content, String contentType,
@@ -243,9 +245,10 @@ public class OperationSetBasicInstantMessagingSSHImpl
             if(sshProvider != null)
             {
                 OperationSetBasicInstantMessagingSSHImpl opSetIM
-                        = (OperationSetBasicInstantMessagingSSHImpl)
-                        sshProvider.getOperationSet(
-                        OperationSetBasicInstantMessaging.class);
+                    = (OperationSetBasicInstantMessagingSSHImpl)
+                        sshProvider
+                            .getOperationSet(
+                                OperationSetBasicInstantMessaging.class);
                 opSetIM.deliverMessage(message, to);
             }
             else
diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/SSHReaderDaemon.java b/src/net/java/sip/communicator/impl/protocol/ssh/SSHReaderDaemon.java
index 2a4cab4..180bd12 100644
--- a/src/net/java/sip/communicator/impl/protocol/ssh/SSHReaderDaemon.java
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/SSHReaderDaemon.java
@@ -80,9 +80,12 @@ public class SSHReaderDaemon
     public SSHReaderDaemon(ContactSSH sshContact)
     {
         this.sshContact = (ContactSSHImpl)sshContact;
-        instantMessaging = (OperationSetBasicInstantMessagingSSHImpl) sshContact
-            .getProtocolProvider().getOperationSet(
-                    OperationSetBasicInstantMessaging.class);
+        instantMessaging =
+            (OperationSetBasicInstantMessagingSSHImpl)
+                sshContact
+                    .getProtocolProvider()
+                        .getOperationSet(
+                            OperationSetBasicInstantMessaging.class);
     }
     
     /**