diff --git a/lib/installer-exclude/jmf.jar b/lib/installer-exclude/jmf.jar
index 529295184..b10e9c36a 100644
Binary files a/lib/installer-exclude/jmf.jar and b/lib/installer-exclude/jmf.jar differ
diff --git a/lib/os-specific/linux/installer-exclude/jmf.jar b/lib/os-specific/linux/installer-exclude/jmf.jar
index b5b7a71c3..2d9d8e2a4 100644
Binary files a/lib/os-specific/linux/installer-exclude/jmf.jar and b/lib/os-specific/linux/installer-exclude/jmf.jar differ
diff --git a/lib/os-specific/mac/installer-exclude/jmf.jar b/lib/os-specific/mac/installer-exclude/jmf.jar
index 456fdaadb..ccadc10e8 100644
Binary files a/lib/os-specific/mac/installer-exclude/jmf.jar and b/lib/os-specific/mac/installer-exclude/jmf.jar differ
diff --git a/lib/os-specific/solaris/installer-exclude/jmf.jar b/lib/os-specific/solaris/installer-exclude/jmf.jar
index a76b80e50..a1765585c 100644
Binary files a/lib/os-specific/solaris/installer-exclude/jmf.jar and b/lib/os-specific/solaris/installer-exclude/jmf.jar differ
diff --git a/lib/os-specific/windows/installer-exclude/jmf.jar b/lib/os-specific/windows/installer-exclude/jmf.jar
index 1408a1518..59af29d2e 100644
Binary files a/lib/os-specific/windows/installer-exclude/jmf.jar and b/lib/os-specific/windows/installer-exclude/jmf.jar differ
diff --git a/src/net/java/sip/communicator/impl/neomedia/EncodingConfigurationTableModel.java b/src/net/java/sip/communicator/impl/neomedia/EncodingConfigurationTableModel.java
index 4931b03f7..ddd8e5660 100644
--- a/src/net/java/sip/communicator/impl/neomedia/EncodingConfigurationTableModel.java
+++ b/src/net/java/sip/communicator/impl/neomedia/EncodingConfigurationTableModel.java
@@ -23,6 +23,11 @@
public class EncodingConfigurationTableModel
extends AbstractTableModel
{
+ /**
+ * Serial version UID.
+ */
+ private final long serialVersionUID = 0L;
+
private final EncodingConfiguration encodingConfiguration;
private MediaFormat[] encodings;
@@ -125,7 +130,7 @@ public int compare(MediaFormat format0, MediaFormat format1)
/*
* In the cases of equal priorities and equal
* encoding names, display them sorted by clock
- * rate in decreasing order.
+ * rate in decreasing order.
*/
ret
= Double.compare(
diff --git a/src/net/java/sip/communicator/impl/neomedia/MediaStreamImpl.java b/src/net/java/sip/communicator/impl/neomedia/MediaStreamImpl.java
index 2bf01d2bb..8d73e21ef 100644
--- a/src/net/java/sip/communicator/impl/neomedia/MediaStreamImpl.java
+++ b/src/net/java/sip/communicator/impl/neomedia/MediaStreamImpl.java
@@ -1619,9 +1619,9 @@ private void startReceiveStreams()
= receiveStream.getDataSource();
/*
- * For an unknown reason, the stream DataSource can be null
- * at the end of the Call after re-INVITEs have been
- * handled.
+ * For an unknown reason, the stream DataSource can be
+ * null at the end of the Call after re-INVITEs have
+ * been handled.
*/
if (receiveStreamDataSource != null)
receiveStreamDataSource.start();
@@ -1848,16 +1848,17 @@ private void stopReceiveStreams()
= receiveStream.getDataSource();
/*
- * For an unknown reason, the stream DataSource can be null
- * at the end of the Call after re-INVITEs have been
- * handled.
+ * For an unknown reason, the stream DataSource can be
+ * null at the end of the Call after re-INVITEs have
+ * been handled.
*/
if (receiveStreamDataSource != null)
receiveStreamDataSource.stop();
}
catch (IOException ioex)
{
- logger.warn("Failed to stop stream " + receiveStream, ioex);
+ logger.warn("Failed to stop stream " + receiveStream,
+ ioex);
}
}
}
@@ -1975,7 +1976,8 @@ public static String toString(DataSource dataSource)
/**
* Notifies this ReceiveStreamListener that the RTPManager
- * it is registered with has generated an event related to a ReceiveStream.
+ * it is registered with has generated an event related to a
+ * ReceiveStream.
*
* @param event the ReceiveStreamEvent which specifies the
* ReceiveStream that is the cause of the event and the very type
@@ -2062,7 +2064,6 @@ public void update(SendStreamEvent event)
// TODO Auto-generated method stub
}
-
/**
* Notifies this SessionListener that the RTPManager it is
* registered with has generated an event which pertains to the session as a
@@ -2120,7 +2121,8 @@ public void update(RemoteEvent remoteEvent)
new StringBuilder(StatisticsEngine.RTP_STAT_PREFIX);
buff.append("Received a report for ")
- .append(getFormat() != null ? getFormat().getMediaType().toString() : "")
+ .append(getFormat() != null ?
+ getFormat().getMediaType().toString() : "")
.append(" stream SSRC:")
.append(getLocalSourceID())
.append(" [packet count:")
diff --git a/src/net/java/sip/communicator/impl/neomedia/device/VideoMediaDeviceSession.java b/src/net/java/sip/communicator/impl/neomedia/device/VideoMediaDeviceSession.java
index f42ae00d8..06c902a1e 100644
--- a/src/net/java/sip/communicator/impl/neomedia/device/VideoMediaDeviceSession.java
+++ b/src/net/java/sip/communicator/impl/neomedia/device/VideoMediaDeviceSession.java
@@ -34,7 +34,6 @@
public class VideoMediaDeviceSession
extends MediaDeviceSession
{
-
/**
* The Logger used by the VideoMediaDeviceSession class
* and its instances for logging output.
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerMediaHandlerJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerMediaHandlerJabberImpl.java
index cc8cd6883..6a39937aa 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerMediaHandlerJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerMediaHandlerJabberImpl.java
@@ -74,7 +74,7 @@ public class CallPeerMediaHandlerJabberImpl
* Creates a new handler that will be managing media streams for
* peer.
*
- * @param peer that CallPeerSipImpl instance that we will be
+ * @param peer that CallPeerJabberImpl instance that we will be
* managing media for.
*/
public CallPeerMediaHandlerJabberImpl(CallPeerJabberImpl peer)
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/InfoRetreiver.java b/src/net/java/sip/communicator/impl/protocol/jabber/InfoRetreiver.java
index cf1da2ece..f445a6586 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/InfoRetreiver.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/InfoRetreiver.java
@@ -46,7 +46,7 @@ public class InfoRetreiver
this.jabberProvider = jabberProvider;
this.ownerUin = ownerUin;
}
-
+
/**
* returns the user details from the specified class or its descendants
* the class is one from the
@@ -284,6 +284,11 @@ private String checkForFullName(VCard card)
public static class WorkDepartmentNameDetail
extends ServerStoredDetails.NameDetail
{
+ /**
+ * Constructor.
+ *
+ * @param workDepartmentName name of the work department
+ */
public WorkDepartmentNameDetail(String workDepartmentName)
{
super("Work Department Name", workDepartmentName);
@@ -296,6 +301,11 @@ public WorkDepartmentNameDetail(String workDepartmentName)
public static class WorkFaxDetail
extends ServerStoredDetails.FaxDetail
{
+ /**
+ * Constructor.
+ *
+ * @param number work fax number
+ */
public WorkFaxDetail(String number)
{
super(number);
@@ -309,6 +319,11 @@ public WorkFaxDetail(String number)
public static class WorkPagerDetail
extends ServerStoredDetails.PhoneNumberDetail
{
+ /**
+ * Constructor.
+ *
+ * @param number work pager number
+ */
public WorkPagerDetail(String number)
{
super(number);
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/JingleNodesHarvester.java b/src/net/java/sip/communicator/impl/protocol/jabber/JingleNodesHarvester.java
index e26439529..85d38c6e0 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/JingleNodesHarvester.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/JingleNodesHarvester.java
@@ -6,7 +6,7 @@
*/
package net.java.sip.communicator.impl.protocol.jabber;
-import java.net.DatagramSocket;
+import java.net.*;
import java.util.*;
import org.ice4j.*;
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 2f3bad7c8..d0837b383 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java
@@ -367,17 +367,17 @@ public void registrationStateChanged(RegistrationStateChangeEvent evt)
if (registrationState == RegistrationState.REGISTERED)
{
- if(logger.isInfoEnabled())
+ if(logger.isDebugEnabled())
{
- logger.info("Subscribes to Coin packets");
+ logger.debug("Subscribes to Coin packets");
}
subscribeForCoinPackets();
}
else if (registrationState == RegistrationState.UNREGISTERED)
{
- if(logger.isInfoEnabled())
+ if(logger.isDebugEnabled())
{
- logger.info("Unsubscribes to Coin packets");
+ logger.debug("Unsubscribes to Coin packets");
}
unsubscribeForCoinPackets();
}
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 3db968072..62a0fd29a 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/UriHandlerJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/UriHandlerJabberImpl.java
@@ -16,7 +16,6 @@
import net.java.sip.communicator.service.protocol.event.*;
import net.java.sip.communicator.util.*;
-
/**
* The jabber implementation of the URI handler. This class handles xmpp URIs by
* trying to establish a chat with them or add you to a chatroom.