diff options
Diffstat (limited to 'src/net/java/sip')
23 files changed, 214 insertions, 78 deletions
diff --git a/src/net/java/sip/communicator/impl/certificate/CertificateServiceImpl.java b/src/net/java/sip/communicator/impl/certificate/CertificateServiceImpl.java index 62ffea9..38f37ac 100644 --- a/src/net/java/sip/communicator/impl/certificate/CertificateServiceImpl.java +++ b/src/net/java/sip/communicator/impl/certificate/CertificateServiceImpl.java @@ -35,7 +35,7 @@ import net.java.sip.communicator.util.swing.*; /**
* Implementation of the CertificateService. It asks the user to trust a
* certificate when the automatic verification fails.
- *
+ *
* @author Ingo Bauersachs
*/
public class CertificateServiceImpl
@@ -47,6 +47,11 @@ public class CertificateServiceImpl private final List<KeyStoreType> supportedTypes =
new LinkedList<KeyStoreType>()
{
+ /**
+ * Serial version UID.
+ */
+ private static final long serialVersionUID = 0L;
+
{
if(!OSUtils.IS_WINDOWS64)
{
@@ -108,7 +113,7 @@ public class CertificateServiceImpl /**
* Helper method to avoid accessing null-lists in the session allowed
* certificate map
- *
+ *
* @param propName the key to access
* @return the list for the given list or a new, empty list put in place for
* the key
@@ -141,6 +146,9 @@ public class CertificateServiceImpl // ------------------------------------------------------------------------
// Truststore configuration
// ------------------------------------------------------------------------
+ /**
+ * Initializes a new <tt>CertificateServiceImpl</tt> instance.
+ */
public CertificateServiceImpl()
{
setTrustStore();
@@ -198,7 +206,7 @@ public class CertificateServiceImpl // ------------------------------------------------------------------------
/*
* (non-Javadoc)
- *
+ *
* @see net.java.sip.communicator.service.certificate.CertificateService#
* getSupportedKeyStoreTypes()
*/
@@ -209,7 +217,7 @@ public class CertificateServiceImpl /*
* (non-Javadoc)
- *
+ *
* @see net.java.sip.communicator.service.certificate.CertificateService#
* getClientAuthCertificateConfigs()
*/
@@ -252,7 +260,7 @@ public class CertificateServiceImpl /*
* (non-Javadoc)
- *
+ *
* @see net.java.sip.communicator.service.certificate.CertificateService#
* setClientAuthCertificateConfig
* (net.java.sip.communicator.service.certificate.CertificateConfigEntry)
@@ -276,7 +284,7 @@ public class CertificateServiceImpl /*
* (non-Javadoc)
- *
+ *
* @see net.java.sip.communicator.service.certificate.CertificateService#
* removeClientAuthCertificateConfig(java.lang.String)
*/
@@ -295,7 +303,7 @@ public class CertificateServiceImpl // ------------------------------------------------------------------------
/*
* (non-Javadoc)
- *
+ *
* @see net.java.sip.communicator.service.certificate.CertificateService#
* addCertificateToTrust(java.security.cert.Certificate, java.lang.String,
* int)
@@ -327,7 +335,7 @@ public class CertificateServiceImpl /*
* (non-Javadoc)
- *
+ *
* @see net.java.sip.communicator.service.certificate.CertificateService#
* getSSLContext()
*/
@@ -338,7 +346,7 @@ public class CertificateServiceImpl /*
* (non-Javadoc)
- *
+ *
* @see net.java.sip.communicator.service.certificate.CertificateService#
* getSSLContext(javax.net.ssl.X509TrustManager)
*/
@@ -448,7 +456,7 @@ public class CertificateServiceImpl /*
* (non-Javadoc)
- *
+ *
* @see net.java.sip.communicator.service.certificate.CertificateService#
* getSSLContext(java.lang.String, javax.net.ssl.X509TrustManager)
*/
@@ -491,7 +499,7 @@ public class CertificateServiceImpl /*
* (non-Javadoc)
- *
+ *
* @see net.java.sip.communicator.service.certificate.CertificateService#
* getSSLContext(javax.net.ssl.KeyManager[], javax.net.ssl.X509TrustManager)
*/
@@ -519,7 +527,7 @@ public class CertificateServiceImpl /*
* (non-Javadoc)
- *
+ *
* @see
* net.java.sip.communicator.service.certificate
* .CertificateService#getTrustManager(java.lang.Iterable)
@@ -536,7 +544,7 @@ public class CertificateServiceImpl /*
* (non-Javadoc)
- *
+ *
* @see
* net.java.sip.communicator.service.certificate.CertificateService
* #getTrustManager(java.lang.String)
@@ -553,7 +561,7 @@ public class CertificateServiceImpl /*
* (non-Javadoc)
- *
+ *
* @see
* net.java.sip.communicator.service.certificate.CertificateService
* #getTrustManager(java.lang.String,
@@ -575,7 +583,7 @@ public class CertificateServiceImpl /*
* (non-Javadoc)
- *
+ *
* @see
* net.java.sip.communicator.service.certificate.CertificateService
* #getTrustManager(java.lang.Iterable,
@@ -975,7 +983,7 @@ public class CertificateServiceImpl /**
* Asks the user whether he trusts the supplied chain of certificates.
- *
+ *
* @param chain The chain of the certificates to check with user.
* @param message A text that describes why the verification failed.
* @return The result of the user interaction. One of
@@ -1019,7 +1027,7 @@ public class CertificateServiceImpl /**
* Calculates the hash of the certificate known as the "thumbprint"
* and returns it as a string representation.
- *
+ *
* @param cert The certificate to hash.
* @param algorithm The hash algorithm to use.
* @return The SHA-1 hash of the certificate.
@@ -1049,11 +1057,11 @@ public class CertificateServiceImpl /**
* Gets the SAN (Subject Alternative Name) of the specified type.
- *
+ *
* @param cert the certificate to extract from
* @param altNameType The type to be returned
* @return SAN of the type
- *
+ *
* <PRE>
* GeneralName ::= CHOICE {
* otherName [0] OtherName,
diff --git a/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java b/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java index ea7e58e..ce89a3d 100644 --- a/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java +++ b/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java @@ -1763,7 +1763,7 @@ public class MetaContactListServiceImpl //ignore if persistent presence is not supported. if(persPresOpSet != null) { - //we don't care about subscription and presence status events here + //we don't care about subscription and presence status events here // any longer. persPresOpSet.removeContactPresenceStatusListener(this); persPresOpSet.removeSubscriptionListener( diff --git a/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsActivator.java b/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsActivator.java index b913924..6e2a0e0 100644 --- a/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsActivator.java +++ b/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsActivator.java @@ -348,6 +348,7 @@ public class GoogleContactsActivator implements BundleActivator * * @param login login * @param password password + * @return a <tt>GoogleContactsSourceService</tt> instance */ public static GoogleContactsSourceService enableContactSource( String login, String password) @@ -385,6 +386,7 @@ public class GoogleContactsActivator implements BundleActivator * <tt>GoogleContactsConnection</tt>. * * @param cnx <tt>GoogleContactsConnection</tt> + * @return a <tt>GoogleContactsSourceService</tt> instance */ public static GoogleContactsSourceService enableContactSource( GoogleContactsConnection cnx) diff --git a/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsConnectionImpl.java b/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsConnectionImpl.java index a73a6b6..6f67ac1 100644 --- a/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsConnectionImpl.java +++ b/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsConnectionImpl.java @@ -166,7 +166,7 @@ public class GoogleContactsConnectionImpl /** * Sets the google contacts prefix. * - * @param prefix the prefix to set + * @param prefix the phone number prefix to set */ public void setPrefix(String prefix) { @@ -174,9 +174,9 @@ public class GoogleContactsConnectionImpl } /** - * Returns the google contacts prefix. + * Returns the google contacts phone number prefix. * - * @return the google contacts prefix + * @return the google contacts phone number prefix */ public String getPrefix() { diff --git a/src/net/java/sip/communicator/impl/googlecontacts/configform/GoogleContactsTableModel.java b/src/net/java/sip/communicator/impl/googlecontacts/configform/GoogleContactsTableModel.java index 7f7045f..3347f4d 100644 --- a/src/net/java/sip/communicator/impl/googlecontacts/configform/GoogleContactsTableModel.java +++ b/src/net/java/sip/communicator/impl/googlecontacts/configform/GoogleContactsTableModel.java @@ -40,6 +40,7 @@ public class GoogleContactsTableModel * * @param cnx account * @param enabled if the account should be enabled + * @param prefix phone number prefix */ public void addAccount( GoogleContactsConnection cnx, boolean enabled, diff --git a/src/net/java/sip/communicator/impl/ldap/LdapActivator.java b/src/net/java/sip/communicator/impl/ldap/LdapActivator.java index e9c50e4..23f691e 100644 --- a/src/net/java/sip/communicator/impl/ldap/LdapActivator.java +++ b/src/net/java/sip/communicator/impl/ldap/LdapActivator.java @@ -191,6 +191,7 @@ public class LdapActivator * Enable contact source service with specified LDAP directory. * * @param ldapDir LDAP directory + * @return an LDAP <tt>ContactSourceService</tt> instance */ public static ContactSourceService registerContactSource( LdapDirectory ldapDir) diff --git a/src/net/java/sip/communicator/impl/ldap/LdapSSLSocketFactoryDelegate.java b/src/net/java/sip/communicator/impl/ldap/LdapSSLSocketFactoryDelegate.java index 35320a0..fcc5422 100644 --- a/src/net/java/sip/communicator/impl/ldap/LdapSSLSocketFactoryDelegate.java +++ b/src/net/java/sip/communicator/impl/ldap/LdapSSLSocketFactoryDelegate.java @@ -25,14 +25,22 @@ import net.java.sip.communicator.util.*; * validate the hostname against the certificate, which leads to an insecure
* communication. It only calls {@link #createSocket(String, int)} when
* <tt>createSocket</tt> is not found
- *
+ *
* @author Ingo Bauersachs
*/
public class LdapSSLSocketFactoryDelegate
{
+ /**
+ * Logger for this class.
+ */
private final static Logger logger =
Logger.getLogger(LdapSSLSocketFactoryDelegate.class);
+ /**
+ * Get default SSL socket factory delegate.
+ *
+ * @return default SSL socket factory delegate.
+ */
public static Object getDefault()
{
return new LdapSSLSocketFactoryDelegate();
@@ -40,7 +48,7 @@ public class LdapSSLSocketFactoryDelegate /**
* Creates a socket for the specified destination host and port.
- *
+ *
* @param host The hostname that the socket connects to.
* @param port The port that the socket connects to.
* @return The created socket.
diff --git a/src/net/java/sip/communicator/impl/neomedia/MediaStreamImpl.java b/src/net/java/sip/communicator/impl/neomedia/MediaStreamImpl.java index 4456369..1928fdd 100644 --- a/src/net/java/sip/communicator/impl/neomedia/MediaStreamImpl.java +++ b/src/net/java/sip/communicator/impl/neomedia/MediaStreamImpl.java @@ -985,15 +985,24 @@ public class MediaStreamImpl */ public InetSocketAddress getRemoteControlAddress() { - // TODO + StreamConnector connector = + (rtpConnector != null) ? rtpConnector.getConnector() : null; + + if(connector != null) + { + if(connector.getDataSocket() != null) + { + return (InetSocketAddress)connector.getControlSocket(). + getRemoteSocketAddress(); + } + else if(connector.getDataTCPSocket() != null) + { + return (InetSocketAddress)connector.getControlTCPSocket(). + getRemoteSocketAddress(); + } + } + return null; - /* - return - (rtpConnector == null) - ? null - : (InetSocketAddress) - rtpConnector.getControlSocket().getRemoteSocketAddress(); - */ } /** @@ -1005,15 +1014,24 @@ public class MediaStreamImpl */ public InetSocketAddress getRemoteDataAddress() { - // TODO + StreamConnector connector = + (rtpConnector != null) ? rtpConnector.getConnector() : null; + + if(connector != null) + { + if(connector.getDataSocket() != null) + { + return (InetSocketAddress)connector.getDataSocket(). + getRemoteSocketAddress(); + } + else if(connector.getDataTCPSocket() != null) + { + return (InetSocketAddress)connector.getDataTCPSocket(). + getRemoteSocketAddress(); + } + } + return null; - /* - return - (rtpConnector == null) - ? null - : (InetSocketAddress) - rtpConnector.getDataSocket().getRemoteSocketAddress(); - */ } /** diff --git a/src/net/java/sip/communicator/impl/neomedia/MediaUtils.java b/src/net/java/sip/communicator/impl/neomedia/MediaUtils.java index 4cd3063..d3acf61 100644 --- a/src/net/java/sip/communicator/impl/neomedia/MediaUtils.java +++ b/src/net/java/sip/communicator/impl/neomedia/MediaUtils.java @@ -15,7 +15,7 @@ import javax.sdp.*; import net.java.sip.communicator.impl.neomedia.codec.*; import net.java.sip.communicator.impl.neomedia.format.*; import net.java.sip.communicator.service.neomedia.*; -import net.java.sip.communicator.service.neomedia.device.ScreenDevice; +import net.java.sip.communicator.service.neomedia.device.*; import net.java.sip.communicator.service.neomedia.format.*; import net.java.sip.communicator.util.*; diff --git a/src/net/java/sip/communicator/impl/neomedia/RawPacket.java b/src/net/java/sip/communicator/impl/neomedia/RawPacket.java index 34667a7..6bca074 100644 --- a/src/net/java/sip/communicator/impl/neomedia/RawPacket.java +++ b/src/net/java/sip/communicator/impl/neomedia/RawPacket.java @@ -102,7 +102,7 @@ public class RawPacket {
return this.offset;
}
-
+
/**
* @param buffer the buffer to set
*/
@@ -310,11 +310,11 @@ public class RawPacket }
/**
- * Grow the internal packet buffer.
- *
+ * Grow the internal packet buffer.
+ *
* This will change the data buffer of this packet but not the
* length of the valid data. Use this to grow the internal buffer
- * to avoid buffer re-allocations when appending data.
+ * to avoid buffer re-allocations when appending data.
*
* @param howMuch number of bytes to grow
*/
@@ -327,7 +327,7 @@ public class RawPacket offset = 0;
buffer = newBuffer;
}
-
+
/**
* Append a byte array to the end of the packet. This may change the data
* buffer of this packet.
@@ -339,7 +339,7 @@ public class RawPacket if (data == null || len == 0) {
return;
}
-
+
// re-allocate internal buffer if it is too small
if ((this.length + len) > (buffer.length - this.offset)) {
byte[] newBuffer = new byte[this.length + len];
@@ -350,7 +350,7 @@ public class RawPacket // append data
System.arraycopy(data, 0, this.buffer, this.length, len);
this.length = this.length + len;
-
+
}
/**
@@ -513,7 +513,6 @@ public class RawPacket /**
* Get RTCP SSRC from a RTCP packet
*
- * @param pkt the source RTP packet
* @return RTP SSRC from source RTP packet
*/
public long GetRTCPSSRC()
@@ -533,7 +532,7 @@ public class RawPacket /**
* Get SRTCP sequence number from a SRTCP packet
*
- * @param pkt the source SRTCP packet
+ * @param authTagLen authentication tag length
* @return SRTCP sequence num from source packet
*/
public int getSRTCPIndex(int authTagLen)
diff --git a/src/net/java/sip/communicator/impl/neomedia/SecurityConfigForm.java b/src/net/java/sip/communicator/impl/neomedia/SecurityConfigForm.java index 7f18a62..eea7167 100644 --- a/src/net/java/sip/communicator/impl/neomedia/SecurityConfigForm.java +++ b/src/net/java/sip/communicator/impl/neomedia/SecurityConfigForm.java @@ -25,6 +25,11 @@ public class SecurityConfigForm extends TransparentPanel { /** + * Serial version UID. + */ + private static final long serialVersionUID = 0L; + + /** * Creates an instance of <tt>SecurityConfigForm</tt>. */ public SecurityConfigForm() @@ -58,6 +63,11 @@ public class SecurityConfigForm { SIPCommDialog zrtpDialog = new SIPCommDialog() { + /** + * Serial version UID. + */ + private static final long serialVersionUID = 0L; + @Override protected void close(boolean escaped) {} }; diff --git a/src/net/java/sip/communicator/impl/neomedia/VideoMediaStreamImpl.java b/src/net/java/sip/communicator/impl/neomedia/VideoMediaStreamImpl.java index fca3a0b..54f5405 100644 --- a/src/net/java/sip/communicator/impl/neomedia/VideoMediaStreamImpl.java +++ b/src/net/java/sip/communicator/impl/neomedia/VideoMediaStreamImpl.java @@ -941,7 +941,7 @@ public class VideoMediaStreamImpl new QualityPreset(res[0])); qualityControl.setRemoteReceiveResolution( res[1]); - outputSize = res[1]; + outputSize = res[1]; ((VideoMediaDeviceSession)getDeviceSession()). setOutputSize(outputSize); } diff --git a/src/net/java/sip/communicator/impl/neomedia/format/ParameterizedVideoFormat.java b/src/net/java/sip/communicator/impl/neomedia/format/ParameterizedVideoFormat.java index 8be3b5d..adf5fc5 100644 --- a/src/net/java/sip/communicator/impl/neomedia/format/ParameterizedVideoFormat.java +++ b/src/net/java/sip/communicator/impl/neomedia/format/ParameterizedVideoFormat.java @@ -23,10 +23,25 @@ public class ParameterizedVideoFormat extends VideoFormat
{
/**
+ * Serial version UID.
+ */
+ private static final long serialVersionUID = 0L;
+
+ /**
* The format parameters of this <tt>ParameterizedVideoFormat</tt> instance.
*/
private Map<String, String> fmtps;
+ /**
+ * Constructs a new <tt>ParametizedVideoFormat</tt>.
+ *
+ * @param encoding encoding
+ * @param size video size
+ * @param maxDataLength maximum data length
+ * @param dataType data type
+ * @param frameRate frame rate
+ * @param fmtps format parameters
+ */
public ParameterizedVideoFormat(
String encoding,
Dimension size,
@@ -151,6 +166,12 @@ public class ParameterizedVideoFormat getFormatParameters(), objFmtps);
}
+ /**
+ * Returns whether or not the format parameters match.
+ *
+ * @param format format to test
+ * @return true if the format parameters match.
+ */
public boolean formatParametersMatch(Format format)
{
Map<String, String> formatFmtps = null;
@@ -164,11 +185,22 @@ public class ParameterizedVideoFormat getFormatParameters(), formatFmtps);
}
+ /**
+ * Returns the format parameters value for the specified name.
+ *
+ * @param name format parameters name
+ * @return value for the specified format parameters name
+ */
public String getFormatParameter(String name)
{
return fmtps.get(name);
}
+ /**
+ * Returns the format parameters <tt>Map</tt>.
+ *
+ * @return the format parameters <tt>Map</tt>.
+ */
public Map<String, String> getFormatParameters()
{
return new HashMap<String, String>(fmtps);
diff --git a/src/net/java/sip/communicator/impl/neomedia/jmfext/media/renderer/video/JAWTRendererSwingVideoComponent.java b/src/net/java/sip/communicator/impl/neomedia/jmfext/media/renderer/video/JAWTRendererSwingVideoComponent.java index aa3e0cd..f185f86 100644 --- a/src/net/java/sip/communicator/impl/neomedia/jmfext/media/renderer/video/JAWTRendererSwingVideoComponent.java +++ b/src/net/java/sip/communicator/impl/neomedia/jmfext/media/renderer/video/JAWTRendererSwingVideoComponent.java @@ -26,6 +26,11 @@ public class JAWTRendererSwingVideoComponent extends JPanel { /** + * Serial version UID. + */ + private static final long serialVersionUID = 0L; + + /** * The <tt>Logger</tt> used by the <tt>JAWTRendererSwingVideoComponent</tt> * class and its instances for logging output. */ @@ -61,7 +66,7 @@ public class JAWTRendererSwingVideoComponent * resized only if the native counterpart of this * SwingVideoComponent expects bounds in a coordinate system * which changes with respect to the bounds of this - * SwingVideoComponent when the parent gets resized. + * SwingVideoComponent when the parent gets resized. */ //processLightweightComponentEvent(); } @@ -82,6 +87,11 @@ public class JAWTRendererSwingVideoComponent */ private boolean wantsPaint = true; + /** + * Constructor. + * + * @param renderer <tt>JAWTRenderer</tt> instance + */ public JAWTRendererSwingVideoComponent(JAWTRenderer renderer) { this.renderer = renderer; @@ -152,6 +162,8 @@ public class JAWTRendererSwingVideoComponent /** * Creates a new AWT <tt>Component</tt> in which * <tt>SwingVideoComponent</tt>s can be rendered. + * @return new AWT <tt>Component</tt> in which <tt>SwingVideoComponent</tt>s + * can be rendered */ public Component createCanvas() { @@ -502,6 +514,11 @@ public class JAWTRendererSwingVideoComponent extends JAWTRendererVideoComponent { /** + * Serial version UID. + */ + private static final long serialVersionUID = 0L; + + /** * The handle to the native <tt>JAWTRenderer</tt> which does the actual * painting of this <tt>SwingVideoComponentCanvas</tt>. */ @@ -638,7 +655,7 @@ public class JAWTRendererSwingVideoComponent * continue to receive, for example, MouseMotionEvents even * when the point has moved out of it. Emulate the same behavior * for the Components this SwingVideoComponentCanvas dispatches - * events to since it is transparent in this respect. + * events to since it is transparent in this respect. */ if (MouseEvent.MOUSE_PRESSED == id) mousePressedComponent = null; diff --git a/src/net/java/sip/communicator/impl/neomedia/jmfext/media/renderer/video/JAWTRendererVideoComponent.java b/src/net/java/sip/communicator/impl/neomedia/jmfext/media/renderer/video/JAWTRendererVideoComponent.java index f016c03..6089469 100644 --- a/src/net/java/sip/communicator/impl/neomedia/jmfext/media/renderer/video/JAWTRendererVideoComponent.java +++ b/src/net/java/sip/communicator/impl/neomedia/jmfext/media/renderer/video/JAWTRendererVideoComponent.java @@ -17,6 +17,11 @@ public class JAWTRendererVideoComponent extends Canvas { /** + * Serial version UID. + */ + private static final long serialVersionUID = 0L; + + /** * The <tt>JAWTRenderer</tt> which paints in this * <tt>JAWTRendererVideoComponent</tt>. */ diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerJabberImpl.java index 9c9f502..14b19c4 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerJabberImpl.java @@ -1201,7 +1201,7 @@ public class CallPeerJabberImpl */ protected void sendTransportInfo(Iterable<ContentPacketExtension> contents) { - // if the call is cancelled, do not start sending candidates in + // if the call is canceled, do not start sending candidates in // transport-info if(cancelled) return; diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/keepalive/KeepAliveEvent.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/keepalive/KeepAliveEvent.java index 1b835ff..f4f1e03 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/keepalive/KeepAliveEvent.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/keepalive/KeepAliveEvent.java @@ -21,7 +21,14 @@ import org.jivesoftware.smack.util.*; public class KeepAliveEvent extends IQ { + /** + * Element name for source provider hash. + */ public static final String SOURCE_PROVIDER_HASH = "src-provider-hash"; + + /** + * Element name for source opset hash. + */ public static final String SOURCE_OPSET_HASH = "src-opset-hash"; private int srcProviderHash = -1; diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/keepalive/KeepAliveEventProvider.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/keepalive/KeepAliveEventProvider.java index 4b64527..46588ce 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/keepalive/KeepAliveEventProvider.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/keepalive/KeepAliveEventProvider.java @@ -19,7 +19,14 @@ import org.xmlpull.v1.*; public class KeepAliveEventProvider implements IQProvider { + /** + * Element name for keepalive. + */ public static final String ELEMENT_NAME = "keepalive"; + + /** + * Namespace for keepalive. + */ public static final String NAMESPACE = "jitsi:iq:keepalive"; /** diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/mailnotification/MailThreadInfo.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/mailnotification/MailThreadInfo.java index 98069f3..955ebb0 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/mailnotification/MailThreadInfo.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/mailnotification/MailThreadInfo.java @@ -253,12 +253,12 @@ public class MailThreadInfo * Returns the sender that initiated the thread or the first sender in the * list if for some reason we couldn't determine the originator. * + * @param firstNameOnly use only first name * @return the sender that initiated the thread or the first sender in the * list if for some reason we couldn't determine the originator. */ public String findOriginator(boolean firstNameOnly) { - return null; } diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardSessionPacketExtension.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardSessionPacketExtension.java index 2ae7fd1..8a303e8 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardSessionPacketExtension.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardSessionPacketExtension.java @@ -16,6 +16,9 @@ import net.java.sip.communicator.util.*; import org.jivesoftware.smack.packet.*; import org.w3c.dom.*; +/** + * Whiteboard session packet extension. + */ public class WhiteboardSessionPacketExtension implements PacketExtension { @@ -160,7 +163,7 @@ public class WhiteboardSessionPacketExtension /** * Returns the white board session identifier. - * + * * @return the white board session identifier */ public String getWhiteboardSessionId() @@ -170,7 +173,7 @@ public class WhiteboardSessionPacketExtension /** * Sets the white board session identifier. - * + * * @param whiteboardSessionId the identifier of the session */ public void setWhiteboardSessionId(String whiteboardSessionId) @@ -180,7 +183,7 @@ public class WhiteboardSessionPacketExtension /** * Returns the action associated with this session packet extension. - * + * * @return the action associated with this session packet extension. */ public String getAction() @@ -190,7 +193,7 @@ public class WhiteboardSessionPacketExtension /** * Sets the action associated with this session packet extension. - * + * * @param action the action associated with this session packet extension. */ public void setAction(String action) @@ -200,7 +203,7 @@ public class WhiteboardSessionPacketExtension /** * Returns the address of the contact associated with this packet extension - * + * * @return the address of the contact associated with this packet extension */ public String getContactAddress() @@ -210,7 +213,7 @@ public class WhiteboardSessionPacketExtension /** * Sets the address of the contact associated with this packet extension - * + * * @param contactAddress the address of the contact associated with this * packet extension */ diff --git a/src/net/java/sip/communicator/impl/protocol/sip/sdp/SdpUtils.java b/src/net/java/sip/communicator/impl/protocol/sip/sdp/SdpUtils.java index d0c395e..990488a 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/sdp/SdpUtils.java +++ b/src/net/java/sip/communicator/impl/protocol/sip/sdp/SdpUtils.java @@ -80,7 +80,7 @@ public class SdpUtils * Creates an Attribute object with the specified values. * * @param name the name of the attribute - * @param value the value of the attribute + * @param value the value of the attribute * * @return Attribute */ diff --git a/src/net/java/sip/communicator/impl/sysactivity/SystemActivityNotifications.java b/src/net/java/sip/communicator/impl/sysactivity/SystemActivityNotifications.java index f2737c5..9f58820 100644 --- a/src/net/java/sip/communicator/impl/sysactivity/SystemActivityNotifications.java +++ b/src/net/java/sip/communicator/impl/sysactivity/SystemActivityNotifications.java @@ -163,7 +163,7 @@ public class SystemActivityNotifications /**
* Returns the when was last input in milliseconds. The time when
* there was any activity on the computer.
- * @return
+ * @return the last input in milliseconds
*/
public static native long getLastInput();
diff --git a/src/net/java/sip/communicator/launcher/SIPCommunicator.java b/src/net/java/sip/communicator/launcher/SIPCommunicator.java index 918b711..cc941dd 100644 --- a/src/net/java/sip/communicator/launcher/SIPCommunicator.java +++ b/src/net/java/sip/communicator/launcher/SIPCommunicator.java @@ -20,6 +20,7 @@ import org.apache.felix.main.*; * @author Yana Stamcheva * @author Lyubomir Marinov * @author Emil Ivov + * @author Sebastien Vincent */ public class SIPCommunicator { @@ -61,19 +62,7 @@ public class SIPCommunicator String vmVendor = System.getProperty("java.vendor"); String osName = System.getProperty("os.name"); - // setup here all system properties that need to be initialized at - // the very beginning of an application - if(osName.startsWith("Windows")) - { - // disable Direct 3D pipeline (used for fullscreen) before - // displaying anything (frame, ...) - System.setProperty("sun.java2d.d3d", "false"); - } - else if(osName.startsWith("Mac")) - { - System.setProperty("apple.awt.fullscreencapturealldisplays", - "false"); - } + setSystemProperties(osName); /* * SC_HOME_DIR_* are specific to the OS so make sure they're configured @@ -157,7 +146,7 @@ public class SIPCommunicator * @param osName the name of the OS according to which the SC_HOME_DIR_* * properties are to be set */ - static void setScHomeDir(String osName) + private static void setScHomeDir(String osName) { /* * Though we'll be setting the SC_HOME_DIR_* property values depending @@ -260,4 +249,33 @@ public class SIPCommunicator // when we end up with the home dirs, make sure we have log dir new File(location, name + File.separator + "log").mkdirs(); } + + /** + * Sets some system properties specific to the OS that needs to be set at + * the very beginning of a program (typically for UI related properties, + * before AWT is launched). + * + * @param osName OS name + */ + private static void setSystemProperties(String osName) + { + // setup here all system properties that need to be initialized at + // the very beginning of an application + if(osName.startsWith("Windows")) + { + // disable Direct 3D pipeline (used for fullscreen) before + // displaying anything (frame, ...) + System.setProperty("sun.java2d.d3d", "false"); + } + else if(osName.startsWith("Mac")) + { + // On Mac OS X when switch in fullscreen, all the monitors goes + // fullscreen (turns black) and only one monitors has images + // displayed. So disable this behavior because somebody may want + // to use one monitor to do other stuff while having other ones with + // fullscreen stuff. + System.setProperty("apple.awt.fullscreencapturealldisplays", + "false"); + } + } } |