Fixes warnings. Adds and/or fixes javadocs.

3 files changed, 16 insertions, 12 deletions

diff --git a/src/net/java/sip/communicator/impl/neomedia/CallRecordingConfigForm.java b/src/net/java/sip/communicator/impl/neomedia/CallRecordingConfigForm.java
index 0330d13..24eb663 100644
--- a/src/net/java/sip/communicator/impl/neomedia/CallRecordingConfigForm.java
+++ b/src/net/java/sip/communicator/impl/neomedia/CallRecordingConfigForm.java
@@ -60,7 +60,7 @@ public class CallRecordingConfigForm
      * Directory choose dialog.
      */
     private final SipCommFileChooser dirChooser;
-    private JComboBox formatsComboBox;
+    private JComboBox<String> formatsComboBox;
     private JCheckBox saveCallsToCheckBox;
     /**
      * Directory where calls are stored. Default is SC_HOME/calls.
@@ -184,10 +184,10 @@ public class CallRecordingConfigForm
      */
     private Component createFormatsComboBox()
     {
-        ComboBoxModel formatsComboBoxModel
-            = new DefaultComboBoxModel(RecorderImpl.SUPPORTED_FORMATS);
+        ComboBoxModel<String> formatsComboBoxModel
+            = new DefaultComboBoxModel<String>(RecorderImpl.SUPPORTED_FORMATS);
 
-        formatsComboBox = new JComboBox();
+        formatsComboBox = new JComboBox<String>();
         formatsComboBox.setPreferredSize(new Dimension(200, 30));
         formatsComboBox.setModel(formatsComboBoxModel);
 
diff --git a/src/net/java/sip/communicator/impl/neomedia/DeviceConfigurationComboBoxModel.java b/src/net/java/sip/communicator/impl/neomedia/DeviceConfigurationComboBoxModel.java
index d52eec5..c4dd0bb 100644
--- a/src/net/java/sip/communicator/impl/neomedia/DeviceConfigurationComboBoxModel.java
+++ b/src/net/java/sip/communicator/impl/neomedia/DeviceConfigurationComboBoxModel.java
@@ -27,7 +27,7 @@ import org.jitsi.service.neomedia.*;
  * @author Damian Minkov

  */

 public class DeviceConfigurationComboBoxModel

-    implements ComboBoxModel,

+    implements ComboBoxModel<Object>,

                PropertyChangeListener

 {

     /**

diff --git a/src/net/java/sip/communicator/impl/neomedia/codec/video/h264/ConfigurationPanel.java b/src/net/java/sip/communicator/impl/neomedia/codec/video/h264/ConfigurationPanel.java
index 36892b3..ff29288 100644
--- a/src/net/java/sip/communicator/impl/neomedia/codec/video/h264/ConfigurationPanel.java
+++ b/src/net/java/sip/communicator/impl/neomedia/codec/video/h264/ConfigurationPanel.java
@@ -56,7 +56,8 @@ public class ConfigurationPanel
         gridBagConstraints.gridy = 0;
         contentPanel.add(defaultProfileLabel, gridBagConstraints);
 
-        JComboBox defaultProfileComboBox = new JComboBox();
+        JComboBox<NameValuePair> defaultProfileComboBox
+            = new JComboBox<NameValuePair>();
         defaultProfileComboBox.setEditable(false);
         defaultProfileComboBox.addItem(
                 new NameValuePair(
@@ -85,7 +86,8 @@ public class ConfigurationPanel
         gridBagConstraints.gridy = 1;
         contentPanel.add(preferredKeyFrameRequesterLabel, gridBagConstraints);
 
-        JComboBox preferredKeyFrameRequesterComboBox = new JComboBox();
+        JComboBox<NameValuePair> preferredKeyFrameRequesterComboBox
+            = new JComboBox<NameValuePair>();
         preferredKeyFrameRequesterComboBox.setEditable(false);
         preferredKeyFrameRequesterComboBox.addItem(
                 new NameValuePair(
@@ -116,7 +118,8 @@ public class ConfigurationPanel
         gridBagConstraints.gridy = 2;
         contentPanel.add(presetLabel, gridBagConstraints);
 
-        JComboBox presetComboBox = new JComboBox();
+        JComboBox<NameValuePair> presetComboBox
+            = new JComboBox<NameValuePair>();
         presetComboBox.setEditable(false);
         for(String presetSetting : JNIEncoder.AVAILABLE_PRESETS)
         {
@@ -173,7 +176,7 @@ public class ConfigurationPanel
      * to set the value of
      */
     private void addActionListener(
-            final JComboBox comboBox,
+            final JComboBox<NameValuePair> comboBox,
             final String property)
     {
         comboBox.addActionListener(
@@ -201,14 +204,15 @@ public class ConfigurationPanel
      * @param value the value of the <tt>NameValuePair</tt> to set as the
      * selected item of <tt>comboBox</tt>
      */
-    private void setSelectedNameValuePair(JComboBox comboBox, String value)
+    private void setSelectedNameValuePair(
+            JComboBox<NameValuePair> comboBox,
+            String value)
     {
         int itemCount = comboBox.getItemCount();
 
         for (int itemIndex = 0; itemIndex < itemCount; itemIndex++)
         {
-            NameValuePair nameValuePair
-                = (NameValuePair) comboBox.getItemAt(itemIndex);
+            NameValuePair nameValuePair = comboBox.getItemAt(itemIndex);
 
             if (nameValuePair.value.equals(value))
             {