- 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.

1 files changed, 10 insertions, 9 deletions

diff --git a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java
index 76fa2bb..5ffe8a1 100644
--- a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java
+++ b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java
@@ -77,9 +77,8 @@ public class ContactInfoDetailsPanel
         this.contact = c;

 

         ProtocolProviderService pps = contact.getProtocolProvider();

-        contactInfoOpSet =

-            (OperationSetServerStoredContactInfo) pps

-                .getOperationSet(OperationSetServerStoredContactInfo.class);

+        contactInfoOpSet

+            = pps.getOperationSet(OperationSetServerStoredContactInfo.class);

 

         this.removeAll();

 

@@ -486,13 +485,15 @@ public class ContactInfoDetailsPanel
 

         // If the contact's protocol supports web info, give them a button to

         // get it

-        if (contact.getProtocolProvider().getOperationSet(

-                OperationSetWebContactInfo.class) != null)

+        OperationSetWebContactInfo webContactInfo

+            = contact

+                .getProtocolProvider()

+                    .getOperationSet(OperationSetWebContactInfo.class);

+

+        if (webContactInfo != null)

         {

-            final String urlString = ((OperationSetWebContactInfo) contact

-                .getProtocolProvider().getOperationSet(

-                    OperationSetWebContactInfo.class))

-                    .getWebContactInfo(contact).toString();

+            final String urlString

+                = webContactInfo.getWebContactInfo(contact).toString();

 

             JLabel webInfoLabel = new JLabel("Click to see web info: ");

             JEditorPane webInfoValue = new JEditorPane();