4 files changed, 20 insertions, 28 deletions
diff --git a/launch/org.eclipse.cdt.launchbar.core/src/org/eclipse/cdt/launchbar/core/internal/DefaultLaunchDescriptor.java b/launch/org.eclipse.cdt.launchbar.core/src/org/eclipse/cdt/launchbar/core/DefaultLaunchDescriptor.java
index ebd779f3380..0b21fe150b0 100644
--- a/launch/org.eclipse.cdt.launchbar.core/src/org/eclipse/cdt/launchbar/core/internal/DefaultLaunchDescriptor.java
+++ b/launch/org.eclipse.cdt.launchbar.core/src/org/eclipse/cdt/launchbar/core/DefaultLaunchDescriptor.java
@@ -8,18 +8,16 @@
  * Contributors:
  *     Doug Schaefer
  *******************************************************************************/
-package org.eclipse.cdt.launchbar.core.internal;
+package org.eclipse.cdt.launchbar.core;
 
-import org.eclipse.cdt.launchbar.core.ILaunchDescriptor;
-import org.eclipse.cdt.launchbar.core.ILaunchDescriptorType;
 import org.eclipse.debug.core.ILaunchConfiguration;
 
 public class DefaultLaunchDescriptor implements ILaunchDescriptor {
 
-	private final DefaultLaunchDescriptorType type;
+	private final ILaunchDescriptorType type;
 	private final ILaunchConfiguration config;
 	
-	public DefaultLaunchDescriptor(DefaultLaunchDescriptorType type, ILaunchConfiguration config) {
+	public DefaultLaunchDescriptor(ILaunchDescriptorType type, ILaunchConfiguration config) {
 		this.type = type;
 		this.config = config;
 	}
diff --git a/launch/org.eclipse.cdt.launchbar.core/src/org/eclipse/cdt/launchbar/core/internal/DefaultLaunchConfigurationProvider.java b/launch/org.eclipse.cdt.launchbar.core/src/org/eclipse/cdt/launchbar/core/internal/DefaultLaunchConfigurationProvider.java
index 51803238587..748ba16652b 100644
--- a/launch/org.eclipse.cdt.launchbar.core/src/org/eclipse/cdt/launchbar/core/internal/DefaultLaunchConfigurationProvider.java
+++ b/launch/org.eclipse.cdt.launchbar.core/src/org/eclipse/cdt/launchbar/core/internal/DefaultLaunchConfigurationProvider.java
@@ -1,5 +1,6 @@
 package org.eclipse.cdt.launchbar.core.internal;
 
+import org.eclipse.cdt.launchbar.core.DefaultLaunchDescriptor;
 import org.eclipse.cdt.launchbar.core.ILaunchBarManager;
 import org.eclipse.cdt.launchbar.core.ILaunchConfigurationProvider;
 import org.eclipse.cdt.launchbar.core.ILaunchDescriptor;
diff --git a/launch/org.eclipse.cdt.launchbar.core/src/org/eclipse/cdt/launchbar/core/internal/DefaultLaunchDescriptorType.java b/launch/org.eclipse.cdt.launchbar.core/src/org/eclipse/cdt/launchbar/core/internal/DefaultLaunchDescriptorType.java
index f9c76bb891d..8cee52fbf74 100644
--- a/launch/org.eclipse.cdt.launchbar.core/src/org/eclipse/cdt/launchbar/core/internal/DefaultLaunchDescriptorType.java
+++ b/launch/org.eclipse.cdt.launchbar.core/src/org/eclipse/cdt/launchbar/core/internal/DefaultLaunchDescriptorType.java
@@ -1,5 +1,6 @@
 package org.eclipse.cdt.launchbar.core.internal;
 
+import org.eclipse.cdt.launchbar.core.DefaultLaunchDescriptor;
 import org.eclipse.cdt.launchbar.core.ILaunchBarManager;
 import org.eclipse.cdt.launchbar.core.ILaunchDescriptor;
 import org.eclipse.cdt.launchbar.core.ILaunchDescriptorType;
diff --git a/launch/org.eclipse.cdt.launchbar.core/src/org/eclipse/cdt/launchbar/core/internal/LaunchBarManager.java b/launch/org.eclipse.cdt.launchbar.core/src/org/eclipse/cdt/launchbar/core/internal/LaunchBarManager.java
index 5a1d410e3dc..70aeb46f446 100644
--- a/launch/org.eclipse.cdt.launchbar.core/src/org/eclipse/cdt/launchbar/core/internal/LaunchBarManager.java
+++ b/launch/org.eclipse.cdt.launchbar.core/src/org/eclipse/cdt/launchbar/core/internal/LaunchBarManager.java
@@ -456,53 +456,45 @@ public class LaunchBarManager extends PlatformObject implements ILaunchBarManage
 	@Override
 	public void launchConfigurationAdded(ILaunchConfiguration configuration) {
 		try {
-			boolean added = false;
-			// TODO filter by launch configuration type
-			
-			for (Map<String, ILaunchConfigurationProvider> targetMap : configProviders.values()) {
+			// TODO filter by launch configuration type to avoid loading plug-ins
+			for (ILaunchDescriptorType descriptorType : descriptorTypes) {
+				Map<String, ILaunchConfigurationProvider> targetMap = configProviders.get(descriptorType.getId());
 				for (ILaunchConfigurationProvider configProvider : targetMap.values()) {
 					if (configProvider.launchConfigurationAdded(configuration)) {
-						added = true;
-						break;
+						return;
 					}
 				}
 			}
 
-			if (!added) {
-				launchObjectAdded(configuration);
-			}
+			// No one claimed it, send it through the descriptorTypes
+			launchObjectAdded(configuration);
 		} catch (CoreException e) {
 			Activator.log(e.getStatus());
 		}
 	}
 
 	@Override
-	public void launchConfigurationChanged(ILaunchConfiguration configuration) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
 	public void launchConfigurationRemoved(ILaunchConfiguration configuration) {
 		try {
-			boolean removed = false;
 			// TODO filter by launch configuration type
-			
-			for (Map<String, ILaunchConfigurationProvider> targetMap : configProviders.values()) {
+			for (ILaunchDescriptorType descriptorType : descriptorTypes) {
+				Map<String, ILaunchConfigurationProvider> targetMap = configProviders.get(descriptorType.getId());
 				for (ILaunchConfigurationProvider configProvider : targetMap.values()) {
 					if (configProvider.launchConfigurationRemoved(configuration)) {
-						removed = true;
-						break;
+						return;
 					}
 				}
 			}
 
-			if (!removed) {
-				launchObjectRemoved(configuration);
-			}
+			launchObjectRemoved(configuration);
 		} catch (CoreException e) {
 			Activator.log(e.getStatus());
 		}
 	}
 
+	@Override
+	public void launchConfigurationChanged(ILaunchConfiguration configuration) {
+		// Nothing to do on changes
+	}
+
 }