Fixes warnings.

5 files changed, 47 insertions, 48 deletions

diff --git a/src/net/java/sip/communicator/impl/muc/ChatRoomSourceContact.java b/src/net/java/sip/communicator/impl/muc/ChatRoomSourceContact.java
index f0a58a0..f553154 100644
--- a/src/net/java/sip/communicator/impl/muc/ChatRoomSourceContact.java
+++ b/src/net/java/sip/communicator/impl/muc/ChatRoomSourceContact.java
@@ -5,8 +5,6 @@
  */

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

 

-import java.util.*;

-

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

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

 

@@ -22,14 +20,15 @@ public class ChatRoomSourceContact
      * The parent contact query.

      */

     private final ChatRoomQuery parentQuery;

-    

+

     /**

      * The protocol provider of the chat room associated with the contact.

      */

     private boolean isAutoJoin;

-    

+

     /**

-     * Contsructs new chat room source contact.

+     * Constructs a new chat room source contact.

+     *

      * @param chatRoomName the name of the chat room associated with the room.

      * @param chatRoomID the id of the chat room associated with the room.

      * @param query the query associated with the contact.

@@ -47,10 +46,10 @@ public class ChatRoomSourceContact
         

         initContactProperties(getChatRoomStateByName());

     }

-    

+

     /**

      * Constructs new chat room source contact.

-     * 

+     *

      * @param chatRoom the chat room associated with the contact.

      * @param query the query associated with the contact.

      * @param isAutoJoin the auto join state

@@ -64,17 +63,16 @@ public class ChatRoomSourceContact
         this.isAutoJoin = isAutoJoin;

         

         initContactProperties(

-            (chatRoom.isJoined()? 

-                ChatRoomPresenceStatus.CHAT_ROOM_ONLINE : 

-                    ChatRoomPresenceStatus.CHAT_ROOM_OFFLINE));

+                chatRoom.isJoined()

+                    ? ChatRoomPresenceStatus.CHAT_ROOM_ONLINE

+                    : ChatRoomPresenceStatus.CHAT_ROOM_OFFLINE);

         

     }

-    

-    

+

     /**

-     * Checks if the chat room associated with the contact is joinned or not and 

+     * Checks if the chat room associated with the contact is joined or not and 

      * returns it presence status.

-     * 

+     *

      * @return the presence status of the chat room associated with the contact.

      */

     private PresenceStatus getChatRoomStateByName()

@@ -90,7 +88,7 @@ public class ChatRoomSourceContact
         }

         return ChatRoomPresenceStatus.CHAT_ROOM_OFFLINE;

     }

-    

+

     /**

      * Returns the index of this source contact in its parent group.

      *

@@ -104,6 +102,7 @@ public class ChatRoomSourceContact
 

     /**

      * Returns the auto join state of the contact.

+     *

      * @return the auto join state of the contact.

      */

     public boolean isAutoJoin()

@@ -113,6 +112,7 @@ public class ChatRoomSourceContact
 

     /**

      * Sets the auto join state of the contact.

+     *

      * @param isAutoJoin the auto join state to be set.

      */

     public void setAutoJoin(boolean isAutoJoin)

diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java
index 9adc434..175802c 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java
@@ -459,8 +459,9 @@ public class OperationSetTelephonyConferencingJabberImpl
      * temporary and should be removed once we choose a better way to pass the

      * SID.

      */

+    @Override

     protected ConferenceInfoDocument getCurrentConferenceInfo(

-            MediaAwareCallPeer callPeer)

+            MediaAwareCallPeer<?,?,?> callPeer)

     {

         ConferenceInfoDocument confInfo

                 = super.getCurrentConferenceInfo(callPeer);

diff --git a/src/net/java/sip/communicator/plugin/desktoputil/presence/NewStatusMessageDialog.java b/src/net/java/sip/communicator/plugin/desktoputil/presence/NewStatusMessageDialog.java
index 5ebe372..0a39da7 100644
--- a/src/net/java/sip/communicator/plugin/desktoputil/presence/NewStatusMessageDialog.java
+++ b/src/net/java/sip/communicator/plugin/desktoputil/presence/NewStatusMessageDialog.java
@@ -11,8 +11,9 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
+import org.jitsi.service.resources.*;
+
 import net.java.sip.communicator.plugin.desktoputil.*;
-import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.skin.*;
 
 /**
@@ -41,8 +42,10 @@ public class NewStatusMessageDialog
     /**
      * The button, used to cancel this dialog.
      */
-    private final JButton cancelButton = new JButton(
-        DesktopUtilActivator.getResources().getI18NString("service.gui.CANCEL"));
+    private final JButton cancelButton
+        = new JButton(
+                DesktopUtilActivator.getResources().getI18NString(
+                        "service.gui.CANCEL"));
 
     /**
      * The current status message.
@@ -57,7 +60,7 @@ public class NewStatusMessageDialog
     /**
      * The parent menu.
      */
-    private AbstractStatusMessageMenu parentMenu;
+    private final AbstractStatusMessageMenu parentMenu;
 
     /**
      * A checkbox when checked, the new message will be saved.
@@ -69,8 +72,8 @@ public class NewStatusMessageDialog
      *
      * @param currentStatusMessage the current status message.
      */
-    public NewStatusMessageDialog (String currentStatusMessage,
-                                   AbstractStatusMessageMenu parentMenu)
+    public NewStatusMessageDialog(String currentStatusMessage,
+                                  AbstractStatusMessageMenu parentMenu)
     {
         super(false);
 
@@ -87,36 +90,31 @@ public class NewStatusMessageDialog
      */
     private void init()
     {
-        JLabel messageLabel = new JLabel(
-            DesktopUtilActivator.getResources().getI18NString(
-                "service.gui.NEW_STATUS_MESSAGE"));
+        ResourceManagementService r = DesktopUtilActivator.getResources();
+        JLabel messageLabel
+            = new JLabel(r.getI18NString("service.gui.NEW_STATUS_MESSAGE"));
 
         JPanel dataPanel
             = new TransparentPanel(new BorderLayout(5, 5));
 
-        JTextArea infoArea = new JTextArea(
-            DesktopUtilActivator.getResources().getI18NString(
-                "service.gui.STATUS_MESSAGE_INFO"));
+        JTextArea infoArea
+            = new JTextArea(r.getI18NString("service.gui.STATUS_MESSAGE_INFO"));
 
-        JLabel infoTitleLabel = new JLabel(
-            DesktopUtilActivator.getResources().getI18NString(
-                "service.gui.NEW_STATUS_MESSAGE"));
+        JLabel infoTitleLabel
+            = new JLabel(r.getI18NString("service.gui.NEW_STATUS_MESSAGE"));
 
         JPanel labelsPanel = new TransparentPanel(new GridLayout(0, 1));
 
-        JButton okButton = new JButton(
-            DesktopUtilActivator.getResources().getI18NString(
-                "service.gui.OK"));
+        JButton okButton = new JButton(r.getI18NString("service.gui.OK"));
 
         JPanel buttonsPanel
             = new TransparentPanel(new FlowLayout(FlowLayout.RIGHT));
 
-        saveNewMessage = new JCheckBox(
-            DesktopUtilActivator.getResources().getI18NString(
-                "service.gui.NEW_STATUS_MESSAGE_SAVE"));
+        saveNewMessage
+            = new JCheckBox(
+                    r.getI18NString("service.gui.NEW_STATUS_MESSAGE_SAVE"));
 
-        this.setTitle(DesktopUtilActivator.getResources()
-                .getI18NString("service.gui.NEW_STATUS_MESSAGE"));
+        this.setTitle(r.getI18NString("service.gui.NEW_STATUS_MESSAGE"));
 
         this.getRootPane().setDefaultButton(okButton);
 
@@ -137,8 +135,8 @@ public class NewStatusMessageDialog
             infoTitleLabel.getFont().deriveFont(Font.BOLD, 18.0f));
 
         saveNewMessage.setSelected(true);
-        JPanel saveToCustomPanel = new TransparentPanel(
-            new FlowLayout(FlowLayout.RIGHT));
+        JPanel saveToCustomPanel
+            = new TransparentPanel(new FlowLayout(FlowLayout.RIGHT));
         saveToCustomPanel.add(saveNewMessage);
 
         labelsPanel.add(infoTitleLabel);
@@ -170,10 +168,8 @@ public class NewStatusMessageDialog
         okButton.setName("ok");
         cancelButton.setName("cancel");
 
-        okButton.setMnemonic(
-            DesktopUtilActivator.getResources().getI18nMnemonic("service.gui.OK"));
-        cancelButton.setMnemonic(
-            DesktopUtilActivator.getResources().getI18nMnemonic("service.gui.CANCEL"));
+        okButton.setMnemonic(r.getI18nMnemonic("service.gui.OK"));
+        cancelButton.setMnemonic(r.getI18nMnemonic("service.gui.CANCEL"));
 
         okButton.addActionListener(this);
         cancelButton.addActionListener(this);
@@ -206,8 +202,10 @@ public class NewStatusMessageDialog
     /**
      * Handles the <tt>ActionEvent</tt>. In order to change the status message
      * with the new one calls the <tt>PublishStatusMessageThread</tt>.
+     *
      * @param e the event that notified us of the action
      */
+    @Override
     public void actionPerformed(ActionEvent e)
     {
         JButton button = (JButton)e.getSource();
diff --git a/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetDTMF.java b/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetDTMF.java
index cdaf915..26b6fb6 100644
--- a/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetDTMF.java
+++ b/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetDTMF.java
@@ -169,7 +169,7 @@ public abstract class AbstractOperationSetDTMF
      * @param peer the call peer.
      * @return whether we can use rfc4733 in this call.
      */
-    protected static boolean isRFC4733Active(MediaAwareCallPeer peer)
+    protected static boolean isRFC4733Active(MediaAwareCallPeer<?,?,?> peer)
     {
         Iterator<MediaFormat> iter =
             peer.getMediaHandler().getStream(MediaType.AUDIO)
diff --git a/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java b/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java
index ec53bee..419ab4f 100644
--- a/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java
+++ b/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java
@@ -1009,7 +1009,7 @@ public abstract class AbstractOperationSetTelephonyConferencing<
      * state of the conference in which this <tt>CallPeer</tt> participates.
      */
     protected ConferenceInfoDocument getCurrentConferenceInfo(
-            MediaAwareCallPeer callPeer)
+            MediaAwareCallPeer<?,?,?> callPeer)
     {
         ConferenceInfoDocument confInfo;
         try
@@ -1109,7 +1109,7 @@ public abstract class AbstractOperationSetTelephonyConferencing<
                      * streams we have already set up with the other
                      * participants in the conference.
                      */
-                    for (MediaAwareCallPeer otherCallPeer
+                    for (MediaAwareCallPeer<?,?,?> otherCallPeer
                             : callPeer.getCall().getCallPeerList())
                     {
                         MediaStream otherStream