sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes warnings.

Browse Source
cefexperiments 5315
Lyubomir Marinov 11 years ago
parent 416a48b4c5
commit a788c54d13
3 changed files with 108 additions and 142 deletions
Show Stats Download Patch File Download Diff File

203
src/net/java/sip/communicator/impl/osdependent/OsDependentActivator.java
Unescape View File

@ -15,8 +15,8 @@
import net.java.sip.communicator.service.shutdown.*;
import net.java.sip.communicator.service.systray.*;
import net.java.sip.communicator.util.*;
import net.java.sip.communicator.util.Logger;
import org.jitsi.service.configuration.*;
import org.jitsi.service.resources.*;
import org.jitsi.util.*;
@ -26,7 +26,7 @@
* Registers the <tt>Systray</tt> in the UI Service.
*
* @author Nicolas Chamouard
* @author Lubomir Marinov
* @author Lyubomir Marinov
*/
public class OsDependentActivator
implements BundleActivator
@ -36,12 +36,8 @@ public class OsDependentActivator
*/
public static BundleContext bundleContext;
public static UIService uiService;
private static ConfigurationService configService;
private static ResourceManagementService resourcesService;
private static GlobalStatusService globalStatusService;
/**
@ -51,14 +47,101 @@ public class OsDependentActivator
private static final Logger logger
= Logger.getLogger(OsDependentActivator.class);
private static ResourceManagementService resourcesService;
public static UIService uiService;
/**
* Returns the <tt>ConfigurationService</tt> obtained from the bundle
* context.
* @return the <tt>ConfigurationService</tt> obtained from the bundle
* context
*/
public static ConfigurationService getConfigurationService()
{
if(configService == null)
{
configService
= ServiceUtils.getService(
bundleContext,
ConfigurationService.class);
}
return configService;
}
/**
* Returns the <tt>GlobalStatusService</tt> obtained from the bundle
* context.
* @return the <tt>GlobalStatusService</tt> obtained from the bundle
* context
*/
public static GlobalStatusService getGlobalStatusService()
{
if (globalStatusService == null)
{
globalStatusService
= ServiceUtils.getService(
bundleContext,
GlobalStatusService.class);
}
return globalStatusService;
}
/**
* Returns the <tt>ResourceManagementService</tt>, through which we will
* access all resources.
*
* @return the <tt>ResourceManagementService</tt>, through which we will
* access all resources.
*/
public static ResourceManagementService getResources()
{
if (resourcesService == null)
{
resourcesService
= ResourceManagementServiceUtils.getService(bundleContext);
}
return resourcesService;
}
/**
* Gets a reference to a <tt>ShutdownService</tt> implementation currently
* registered in the <tt>BundleContext</tt> of the active
* <tt>OsDependentActivator</tt> instance.
* <p>
* The returned reference to <tt>ShutdownService</tt> is not cached.
* </p>
*
* @return reference to a <tt>ShutdownService</tt> implementation currently
* registered in the <tt>BundleContext</tt> of the active
* <tt>OsDependentActivator</tt> instance
*/
public static ShutdownService getShutdownService()
{
return ServiceUtils.getService(bundleContext, ShutdownService.class);
}
/**
* Returns the <tt>UIService</tt> obtained from the bundle context.
* @return the <tt>UIService</tt> obtained from the bundle context
*/
public static UIService getUIService()
{
if(uiService == null)
uiService = ServiceUtils.getService(bundleContext, UIService.class);
return uiService;
}
/**
* Called when this bundle is started.
*
* @param bc The execution context of the bundle being started.
* @throws Exception If
* @throws Exception
*/
@Override
public void start(BundleContext bc)
throws Exception
throws Exception
{
bundleContext = bc;
@ -110,108 +193,14 @@ public void start(BundleContext bc)
* bundle-specific activities necessary to stop the bundle.
*
* @param bc The execution context of the bundle being stopped.
* @throws Exception If this method throws an exception, the bundle is
* still marked as stopped, and the Framework will remove the bundle's
* listeners, unregister all services registered by the bundle, and
* release all services used by the bundle.
* @throws Exception If this method throws an exception, the bundle is still
* marked as stopped, and the Framework will remove the bundle's listeners,
* unregister all services registered by the bundle, and release all
* services used by the bundle.
*/
@Override
public void stop(BundleContext bc)
throws Exception
{
}
/**
* Returns the <tt>ConfigurationService</tt> obtained from the bundle
* context.
* @return the <tt>ConfigurationService</tt> obtained from the bundle
* context
*/
public static ConfigurationService getConfigurationService()
{
if(configService == null) {
ServiceReference configReference = bundleContext
.getServiceReference(ConfigurationService.class.getName());
configService = (ConfigurationService) bundleContext
.getService(configReference);
}
return configService;
}
/**
* Gets a reference to a <code>ShutdownService</code> implementation
* currently registered in the bundle context of the active
* <code>OsDependentActivator</code> instance.
* <p>
* The returned reference to <code>ShutdownService</code> is not being
* cached.
* </p>
*
* @return reference to a <code>ShutdownService</code> implementation
* currently registered in the bundle context of the active
* <code>OsDependentActivator</code> instance
*/
public static ShutdownService getShutdownService()
{
return
(ShutdownService)
bundleContext.getService(
bundleContext.getServiceReference(
ShutdownService.class.getName()));
}
/**
* Returns the <tt>UIService</tt> obtained from the bundle
* context.
* @return the <tt>UIService</tt> obtained from the bundle
* context
*/
public static UIService getUIService()
{
if(uiService == null)
{
ServiceReference serviceRef = bundleContext
.getServiceReference(UIService.class.getName());
if (serviceRef != null)
uiService = (UIService) bundleContext.getService(serviceRef);
}
return uiService;
}
/**
* Returns the <tt>ResourceManagementService</tt>, through which we will
* access all resources.
*
* @return the <tt>ResourceManagementService</tt>, through which we will
* access all resources.
*/
public static ResourceManagementService getResources()
{
if (resourcesService == null)
resourcesService =
ResourceManagementServiceUtils.getService(bundleContext);
return resourcesService;
}
/**
* Returns the <tt>GlobalStatusService</tt> obtained from the bundle
* context.
* @return the <tt>GlobalStatusService</tt> obtained from the bundle
* context
*/
public static GlobalStatusService getGlobalStatusService()
{
if (globalStatusService == null)
{
globalStatusService
= ServiceUtils.getService(
bundleContext,
GlobalStatusService.class);
}
return globalStatusService;
}
}

39
src/net/java/sip/communicator/impl/osdependent/jdic/StatusSubMenu.java
Unescape View File

@ -19,6 +19,7 @@
import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.service.protocol.event.*;
import net.java.sip.communicator.service.protocol.globalstatus.*;
import net.java.sip.communicator.util.*;
import org.osgi.framework.*;
@ -279,37 +280,21 @@ private void init()
*/
private List<ProtocolProviderService> getProtocolProviders()
{
List<ProtocolProviderService> providers
BundleContext bundleContext = OsDependentActivator.bundleContext;
Collection<ServiceReference<ProtocolProviderService>> ppsRefs
= ServiceUtils.getServiceReferences(
bundleContext,
ProtocolProviderService.class);
List<ProtocolProviderService> protocolProviders
= new ArrayList<ProtocolProviderService>();
ServiceReference[] protocolProviderRefs = null;
try
{
protocolProviderRefs
= OsDependentActivator.bundleContext.getServiceReferences(
ProtocolProviderService.class.getName(), null);
}
catch (InvalidSyntaxException ex)
{
return providers;
}
catch(IllegalStateException ise)
{
// happens sometimes on stopping felix
}
// in case we found any
if (protocolProviderRefs != null)
if ((ppsRefs != null) && !ppsRefs.isEmpty())
{
for (ServiceReference protocolProviderRef : protocolProviderRefs)
{
providers.add(
(ProtocolProviderService)
OsDependentActivator
.bundleContext.getService(protocolProviderRef));
}
for (ServiceReference<ProtocolProviderService> ppsRef : ppsRefs)
protocolProviders.add(bundleContext.getService(ppsRef));
}
return providers;
return protocolProviders;
}
/**
@ -540,7 +525,7 @@ public void serviceChanged(ServiceEvent event)
{
//if the event is caused by a bundle being stopped, we don't want to
//know
ServiceReference serviceRef = event.getServiceReference();
ServiceReference<?> serviceRef = event.getServiceReference();
if(serviceRef.getBundle().getState() == Bundle.STOPPING)
return;

8
src/net/java/sip/communicator/impl/osdependent/jdic/SystrayServiceJdicImpl.java
Unescape View File

@ -22,7 +22,6 @@
import net.java.sip.communicator.service.systray.event.*;
import net.java.sip.communicator.util.Logger;
import org.jitsi.service.configuration.*;
import org.jitsi.util.*;
import org.osgi.framework.*;
@ -57,13 +56,6 @@ public class SystrayServiceJdicImpl
*/
private Object menu;
/**
* The <tt>ConfigurationService</tt> obtained from the associated
* <tt>BundleActivator</tt>.
*/
private final ConfigurationService cfg
= OsDependentActivator.getConfigurationService();
/**
* The <tt>Logger</tt> used by the <tt>SystrayServiceJdicImpl</tt> class and
* its instances for logging output.

Write Preview
Loading…
Cancel
Save