swing based popup notifications with tests for the PopupMessage interface.

added checks for null SystemTrayPeer as it this possible it doesnt exists on the cruise control machine

1 files changed, 23 insertions, 1 deletions

diff --git a/src/net/java/sip/communicator/plugin/generalconfig/GeneralConfigPluginActivator.java b/src/net/java/sip/communicator/plugin/generalconfig/GeneralConfigPluginActivator.java
index 94f870a..d2fe808 100644
--- a/src/net/java/sip/communicator/plugin/generalconfig/GeneralConfigPluginActivator.java
+++ b/src/net/java/sip/communicator/plugin/generalconfig/GeneralConfigPluginActivator.java
@@ -8,6 +8,7 @@ package net.java.sip.communicator.plugin.generalconfig;
 
 import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.gui.*;
+import net.java.sip.communicator.service.systray.*;
 import net.java.sip.communicator.util.*;
 
 import org.osgi.framework.*;
@@ -18,6 +19,8 @@ public class GeneralConfigPluginActivator implements BundleActivator
 
     private static ConfigurationService configService;
 
+    private static SystrayService systrayService;
+
     protected static BundleContext bundleContext;
     
     private static UIService uiService;
@@ -66,7 +69,26 @@ public class GeneralConfigPluginActivator implements BundleActivator
 
         return configService;
     }
-    
+
+    /**
+     * Returns the <tt>SystrayService</tt> obtained from the bundle
+     * context.
+     * @return the <tt>SystrayService</tt> obtained from the bundle
+     * context
+     */
+    public static SystrayService getSystrayService()
+    {
+        if(systrayService == null) {
+            ServiceReference configReference = bundleContext
+                .getServiceReference(SystrayService.class.getName());
+
+            systrayService = (SystrayService) bundleContext
+                .getService(configReference);
+        }
+
+        return systrayService;
+    }
+
      /**
      * Returns the <tt>UIService</tt>.
      *