/*
 * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 *
 * Copyright @ 2015 Atlassian Pty Ltd
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package net.java.sip.communicator.impl.growlnotification;

import net.java.sip.communicator.service.resources.*;
import net.java.sip.communicator.service.systray.*;
import net.java.sip.communicator.util.*;

import net.java.sip.communicator.util.osgi.ServiceUtils;
import org.jitsi.service.resources.*;
import org.jitsi.util.OSUtils; // disambiguation
import org.osgi.framework.*;

/**
 * Activates the GrowlNotificationService
 *
 * @author Romain Kuntz
 * @author Egidijus Jankauskas
 * @author Lyubomir Marinov
 */
public class GrowlNotificationActivator
    implements BundleActivator
{
    /**
     * The bundle context in which we started
     */
    public static BundleContext bundleContext;

    /**
     * The <tt>Logger</tt> used by the <tt>GrowlNotificationActivator</tt> class
     * and its instances for logging output.
     */
    private static final Logger logger
        = Logger.getLogger(GrowlNotificationActivator.class);

    /**
     * A reference to the resource management service.
     */
    private static ResourceManagementService resourcesService;

    /**
     * A reference to the Growl notification service
     */
    private static GrowlNotificationServiceImpl handler;

    /**
     * Initializes and starts a new <tt>GrowlNotificationService</tt>
     * implementation on Mac OS X.
     *
     * @param bundleContext the <tt>BundleContext</tt> to register the new
     * <tt>GrowlNotificationService</tt> implementation into
     * @throws Exception if initializing and/or starting the new
     * <tt>GrowlNotificationService</tt> implementation fails
     */
    public void start(BundleContext bundleContext)
        throws Exception
    {
        // This bundle is available for Mac OS X only.
        if (!OSUtils.IS_MAC)
            return;

        if (logger.isInfoEnabled())
            logger.info("Growl Notification... [Starting]");

        GrowlNotificationActivator.bundleContext  = bundleContext;

        handler = new GrowlNotificationServiceImpl();
        handler.start(bundleContext);
        bundleContext.registerService(
                PopupMessageHandler.class.getName(),
                handler,
                null);

        if (logger.isInfoEnabled())
            logger.info("Growl Notification... [Started]");
    }

    /**
     * Stops this bundle.
     *
     * @param bundleContext the <tt>BundleContext</tt> to stop this bundle into
     * @throws Exception if stopping this bundle fails
     */
    public void stop(BundleContext bundleContext)
        throws Exception
    {
        // This bundle is available for Mac OS X only.
        if (!OSUtils.IS_MAC)
            return;

        handler.stop(bundleContext);
        if (logger.isInfoEnabled())
            logger.info("Growl Notification Service... [Stopped]");
    }

    /**
     * Returns the <tt>ResourceManagementService</tt> obtained from the bundle
     * context.
     * @return the <tt>ResourceManagementService</tt> obtained from the bundle
     * context
     */
    public static ResourceManagementService getResources()
    {
        if (resourcesService == null)
        {
            resourcesService
                = ServiceUtils.getService(
                bundleContext,
                ResourceManagementService.class);
        }
        return resourcesService;
    }
}

@@ -727,62 +727,8 @@
 n;%0A%0A
-import net.java.sip.communicator.service.resources.*;%0A
 impo
@@ -860,28 +860,17 @@
 il.osgi.
-ServiceUtils
+*
 ;%0Aimport
@@ -1164,146 +1164,36 @@
     
-implements BundleActivator%0A%7B%0A    /**%0A     * The bundle context in which we started%0A     */%0A    public static BundleContext bundleContext;%0A
+extends DependentActivator%0A%7B
 %0A   
@@ -1695,16 +1695,138 @@
 ndler;%0A%0A
+    public GrowlNotificationActivator()%0A    %7B%0A        super(%0A            ResourceManagementService.class%0A        );%0A    %7D%0A
     /**%0A
@@ -2083,136 +2083,23 @@
    *
- @throws Exception if initializing and/or starting the new%0A     * %3Ctt%3EGrowlNotificationService%3C/tt%3E implementation fails%0A     */
+/%0A    @Override
 %0A   
@@ -2116,16 +2116,28 @@
 id start
+WithServices
 (BundleC
@@ -2162,33 +2162,8 @@
 xt)%0A
-        throws Exception%0A
     
@@ -2379,65 +2379,70 @@
     
-GrowlNotificationActivator.bundleContext  = bundleContext
+resourcesService = getService(ResourceManagementService.class)
 ;%0A%0A 
@@ -2901,63 +2901,8 @@
 nto%0A
-     * @throws Exception if stopping this bundle fails%0A
     
@@ -2959,33 +2959,8 @@
 xt)%0A
-        throws Exception%0A
     
@@ -3488,219 +3488,8 @@
   %7B%0A
-        if (resourcesService == null)%0A        %7B%0A            resourcesService%0A                = ServiceUtils.getService(%0A                bundleContext,%0A                ResourceManagementService.class);%0A        %7D%0A
     

Fix Growl startup order