Bug 280186 - Features missing or listed twice in about dialog
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/BundleGroupComponent.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/BundleGroupComponent.java
index eef0902..8dd577a 100644
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/BundleGroupComponent.java
+++ b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/BundleGroupComponent.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
+ * Copyright (c) 2009, 2010 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
@@ -21,7 +21,12 @@
public class BundleGroupComponent implements IBundleGroupProvider {
public IBundleGroup[] getBundleGroups() {
- return ConfigurationActivator.getConfigurator().getBundleGroups();
+ ConfigurationActivator activator = ConfigurationActivator.getConfigurator();
+ if (activator.bundleGroupProviderSR != null)
+ // we manually registered the group in the activator; return no groups
+ // the manually registered service will handle the groups we know about
+ return new IBundleGroup[0];
+ return activator.getBundleGroups();
}
public String getName() {
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/ConfigurationActivator.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/ConfigurationActivator.java
index e5df17d..367978e 100644
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/ConfigurationActivator.java
+++ b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/ConfigurationActivator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
+ * Copyright (c) 2003, 2010 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
@@ -42,7 +42,7 @@
private static BundleContext context;
private ServiceRegistration configurationFactorySR;
- private ServiceRegistration bundleGroupProviderSR;
+ ServiceRegistration bundleGroupProviderSR;
private PlatformConfiguration configuration;
// Location of the configuration data
