diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/Activator.java')
-rw-r--r-- | bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/Activator.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/Activator.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/Activator.java index 3daf3f4f3..2a4786390 100644 --- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/Activator.java +++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/Activator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2011 IBM Corporation and others. + * Copyright (c) 2005, 2017 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,11 +10,10 @@ *******************************************************************************/ package org.eclipse.equinox.metatype.impl; -import org.eclipse.equinox.metatype.EquinoxMetaTypeService; - import java.util.Dictionary; import java.util.Hashtable; import javax.xml.parsers.SAXParserFactory; +import org.eclipse.equinox.metatype.EquinoxMetaTypeService; import org.osgi.framework.*; import org.osgi.service.cm.ManagedService; import org.osgi.service.log.LogService; @@ -95,14 +94,14 @@ public class Activator implements BundleActivator { private class SAXParserFactoryTrackerCustomizer implements ServiceTrackerCustomizer<SAXParserFactory, SAXParserFactory> { private final BundleContext bundleCtx; - private final LogService logService; + private final LogTracker logService; private final ServiceTracker<Object, Object> mtpTracker; private MetaTypeServiceImpl metaTypeService; private ServiceRegistration<?> metaTypeServiceRegistration; private SAXParserFactory saxParserFactory; - public SAXParserFactoryTrackerCustomizer(BundleContext bundleContext, LogService logService, ServiceTracker<Object, Object> metaTypeProviderTracker) { + public SAXParserFactoryTrackerCustomizer(BundleContext bundleContext, LogTracker logService, ServiceTracker<Object, Object> metaTypeProviderTracker) { this.bundleCtx = bundleContext; this.logService = logService; this.mtpTracker = metaTypeProviderTracker; @@ -125,8 +124,8 @@ public class Activator implements BundleActivator { else if (saxParserFactory.isNamespaceAware()) { return parserFactory; } else if (parserFactory.isNamespaceAware() || // Previous factory not set for namespace awareness but the new one is case. - // Now the fun case. Neither factory is set for namespace awareness. Need to see if we're currently using - // a factory incapable of creating namespace aware parsers and, if so, if it can be replaced with the new one. + // Now the fun case. Neither factory is set for namespace awareness. Need to see if we're currently using + // a factory incapable of creating namespace aware parsers and, if so, if it can be replaced with the new one. (!supportsNamespaceAwareness(saxParserFactory) && supportsNamespaceAwareness(parserFactory))) { oldFactory = saxParserFactory; saxParserFactory = parserFactory; |