Attachment #209698 for bug #236709

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 1-5 Link Here

(-)a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/BundleGroupComponent.java (-4 / +6 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2009, 2010 IBM Corporation and others.	2	* Copyright (c) 2009, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 21-30 import org.eclipse.core.runtime.IBundleGroupProvider; Link Here
21	public class BundleGroupComponent implements IBundleGroupProvider {	21	public class BundleGroupComponent implements IBundleGroupProvider {
22		22
23	public IBundleGroup[] getBundleGroups() {	23	public IBundleGroup[] getBundleGroups() {
		24	// if we are not reconciler then defer bundle group registration
		25	if (!ConfigurationActivator.isReconciling())
		26	return new IBundleGroup[0];
24	ConfigurationActivator activator = ConfigurationActivator.getConfigurator();	27	ConfigurationActivator activator = ConfigurationActivator.getConfigurator();
		28	// we manually registered the group in the activator; return no groups
		29	// the manually registered service will handle the groups we know about
25	if (activator.bundleGroupProviderSR != null)	30	if (activator.bundleGroupProviderSR != null)
26	// we manually registered the group in the activator; return no groups
27	// the manually registered service will handle the groups we know about
28	return new IBundleGroup[0];	31	return new IBundleGroup[0];
29	return activator.getBundleGroups();	32	return activator.getBundleGroups();
30	}	33	}
Lines 32-36 public class BundleGroupComponent implements IBundleGroupProvider { Link Here
32	public String getName() {	35	public String getName() {
33	return ConfigurationActivator.getConfigurator().getName();	36	return ConfigurationActivator.getConfigurator().getName();
34	}	37	}
35
36	}	38	}




/*******************************************************************************
 * Copyright (c) 2003, 2011 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

 *******************************************************************************/
package org.eclipse.update.internal.configurator;

import org.osgi.framework.InvalidSyntaxException;

import java.io.*;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.*;
import org.eclipse.core.runtime.IBundleGroup;
import org.eclipse.core.runtime.IBundleGroupProvider;
import org.eclipse.osgi.framework.log.FrameworkLog;
import org.eclipse.osgi.service.datalocation.Location;
import org.eclipse.osgi.service.debug.DebugOptions;
import org.eclipse.osgi.util.ManifestElement;
import org.eclipse.osgi.util.NLS;
import org.eclipse.update.configurator.IPlatformConfiguration;
import org.eclipse.update.configurator.IPlatformConfigurationFactory;
import org.osgi.framework.*;
import org.osgi.service.packageadmin.PackageAdmin;
import org.osgi.service.startlevel.StartLevel;

public class ConfigurationActivator implements BundleActivator, IBundleGroupProvider, IConfigurationConstants {


		registerBundleGroupProvider();
	}
	

	public static Object getService(BundleContext context, Class clazz) {
		if (context == null)
			return null;
		ServiceReference reference = context.getServiceReference(clazz);
		if (reference == null)
			return null;
		Object result = context.getService(reference);
		context.ungetService(reference);
		return result;
	}

	/**
	 * Returns whether the update configurator should be doing its own reconciling work
	 */

	}

	private void registerBundleGroupProvider() {
		// don't register if p2 is present, defer to them.
		if (!isReconciling())
			return;
		final String serviceName = IBundleGroupProvider.class.getName();
		try {
			//don't register the service if this bundle has already registered it declaratively

Return to bug 236709