Code review for the RSS provider implemnetation. Fixing numerous javadoc conflicts.

2 files changed, 11 insertions, 11 deletions

diff --git a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java
index 94cd189..cf08646 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java
@@ -228,9 +228,9 @@ public class OperationSetBasicTelephonySipImpl
             ((CallSipImpl)callParticipant.getCall())
                 .setMediaCallSession(callSession);
 
-            //if possible try to indicate the address of the callee so that the
-            //media service can choose the most proper local address to
-            //advertise.
+            //if possible try to indicate the address of the callee so
+            //that the media service can choose the most proper local
+            //address to advertise.
             javax.sip.address.URI calleeURI = calleeAddress.getURI();
             InetAddress intendedDestination = null;
             if(calleeURI.isSipURI())
diff --git a/src/net/java/sip/communicator/impl/systray/SystrayActivator.java b/src/net/java/sip/communicator/impl/systray/SystrayActivator.java
index 8769302..366822c 100644
--- a/src/net/java/sip/communicator/impl/systray/SystrayActivator.java
+++ b/src/net/java/sip/communicator/impl/systray/SystrayActivator.java
@@ -20,19 +20,19 @@ import org.osgi.framework.*;
  */
 public class SystrayActivator
     implements BundleActivator
-{ 
+{
     /**
      * A currently valid bundle context.
      */
     public static BundleContext bundleContext;
 
     public static UIService uiService;
-    
+
     private static ConfigurationService configService;
-    
+
     private static Logger logger = Logger.getLogger(
             SystrayActivator.class.getName());
-    
+
     /**
      * Called when this bundle is started.
      *
@@ -47,8 +47,8 @@ public class SystrayActivator
             .getServiceReference(UIService.class.getName());
 
         uiService = (UIService) bundleContext.getService(uiServiceRef);
-        
-        SystrayServiceJdicImpl systray = new SystrayServiceJdicImpl(uiService);               
+
+        SystrayServiceJdicImpl systray = new SystrayServiceJdicImpl(uiService);
     }
 
     /**
@@ -63,7 +63,7 @@ public class SystrayActivator
      */
     public void stop(BundleContext bc) throws Exception {
     }
-    
+
 
     /**
      * Returns the <tt>ConfigurationService</tt> obtained from the bundle
@@ -71,7 +71,7 @@ public class SystrayActivator
      * @return the <tt>ConfigurationService</tt> obtained from the bundle
      * context
      */
-    public static ConfigurationService getConfigurationService() 
+    public static ConfigurationService getConfigurationService()
     {
         if(configService == null) {
             ServiceReference configReference = bundleContext