- Fixes ClassCastException in ChatRoom-related code which handles failure of delivery of a message and in its respective AdHocChatRoom duplicate.

- Simplifies a bit and speeds up ChatWindowManager. Part of the approach to remove its #syncChat and prevent a deadlock with IRC.
- Removes a field or two to reduce the shallow runtime size of the instances of the affected class.
- Fixes a few redundant-cast warnings caused by ProtocolProviderService#getOperationSet(). While doing, fixes an occurrence of a double calling to the method in question while only one call suffices and is faster.

2 files changed, 14 insertions, 8 deletions

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