fix javadoc conflicts

src/net/java/sip/communicator/impl/protocol/rss/ContactRssImpl.java

@@ -6,18 +6,18 @@
  */
 package net.java.sip.communicator.impl.protocol.rss;
 
+import java.awt.*;
+import java.awt.image.*;
+import java.io.*;
+import java.net.*;
 import java.util.*;
-import java.text.*;
+
+import javax.imageio.*;
 
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
-import java.net.*;
 
 import com.ctreber.aclib.image.ico.*;
-import java.io.*;
-import java.awt.*;
-import javax.imageio.*;
-import java.awt.image.*;
 
 /**
  * An implementation of a rss Contact.
@@ -435,7 +435,7 @@ public void setPersistent(boolean isPersistent)
      * item, so that upon restart, items that have already been displayed in
      * older sessions don't get displayed again.
      * 
-     * @see setPersistentData
+     * @see #setPersistentData(String)
      */
     public String getPersistentData()
     {
@@ -448,7 +448,8 @@ public String getPersistentData()
     /***
      * Restores feed item identification data from their textual representation.
      * @param persistentData textual representation of item key.
-     * @see getPersistentData
+     * 
+     * #setPersistentData()
      */
     public void setPersistentData(String persistentData)
     {

src/net/java/sip/communicator/impl/protocol/rss/RSSItemKey.java

@@ -83,8 +83,8 @@ public RssItemKey(String itemUri)
      * 
      * @return <code>true</code> if date is used for identification,
      * <code>false</code> otherwise.
-     * @see getItemDate()
-     * @see getItemUri()
+     * @see #getItemDate()
+     * @see #getItemUri()
      */
     public boolean usesDate()
     {
@@ -96,7 +96,7 @@ public boolean usesDate()
      * returned in case <code>usesDate() == false</code>.
      * 
      * @return date field of the key.
-     * @see usesDate()
+     * @see #usesDate()
      */
     public Date getItemDate()
     {
@@ -108,7 +108,7 @@ public Date getItemDate()
      * returned in case <code>usesDate() == true</code>.
      * 
      * @return URI field of the key.
-     * @see usesDate()
+     * @see #usesDate()
      */
     public String getItemUri()
     {
@@ -173,7 +173,7 @@ public static RssItemKey deserialize(String settings)
      * Returns the textual representation of the settings object. This can
      * be easily de-serialized with a call to <code>deserialize()</code>.
      * 
-     * @see deserialize()
+     * @see #deserialize(String)
      */
     public String toString()
     {

src/net/java/sip/communicator/impl/systray/jdic/ProviderRegistration.java

@@ -38,7 +38,6 @@ public class ProviderRegistration
     /**
      * Creates an instance of <tt>ProviderRegistration</tt>.
      *
-     * @param uiService a reference to the currently valid ui service instance.
      * @param protocolProvider the provider we want to register
      */
     public ProviderRegistration(ProtocolProviderService protocolProvider)

src/net/java/sip/communicator/impl/systray/jdic/SystrayServiceJdicImpl.java

@@ -26,7 +26,6 @@
 import net.java.sip.communicator.util.*;
 
 import org.jdesktop.jdic.tray.*;
-import org.osgi.framework.*;
 
 /**
  * The <tt>Systray</tt> provides a Icon and the associated <tt>TrayMenu</tt>
@@ -74,7 +73,6 @@ public class SystrayServiceJdicImpl
 
     /**
      * Creates an instance of <tt>Systray</tt>.
-     * @param service a reference of the current <tt>UIservice</tt>
      */
     public SystrayServiceJdicImpl()
     {

src/net/java/sip/communicator/service/protocol/WhiteboardSession.java

@@ -16,7 +16,8 @@
  * @author Julien Waechter
  * @author Emil Ivov
  */
-public interface WhiteboardSession {
+public interface WhiteboardSession
+{
 
     /**
      * Returns the id of the specified Whiteboard.
@@ -91,7 +92,7 @@ public void removeWhiteboardChangeListener(
 
     /**
      * Returns true if the local user is currently in the whiteboard session
-     * (after whiteboarding one of the {@link #join(String)} methods).
+     * (after whiteboarding one of the {@link #join()} methods).
      *
      * @return true if currently we're currently in this whiteboard and false
      * otherwise.