Bug 288192 - Competing launch configurationTabGroup contribution should generate warning

2 files changed, 20 insertions, 12 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java
index 1a683626e..92e84b0d5 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java
@@ -107,7 +107,6 @@ public class LaunchConfigurationPresentationManager {
 			String typeId = null;
 			Map map = null;
 			List modes = null;
-			LaunchConfigurationTabGroupExtension oldext = null;
 			for (int i = 0; i < groups.length; i++) {
 				group = new LaunchConfigurationTabGroupExtension(groups[i]);
 				typeId = group.getTypeIdentifier();
@@ -118,24 +117,33 @@ public class LaunchConfigurationPresentationManager {
 				}
 				modes = group.getModes();
 				if(modes.isEmpty()) {
-					oldext = (LaunchConfigurationTabGroupExtension) map.put("*", group); //$NON-NLS-1$
-					if(oldext != null) {
-						DebugUIPlugin.logErrorMessage(NLS.bind(LaunchConfigurationsMessages.LaunchConfigurationPresentationManager_0, 
-								new String[]{oldext.getIdentifier(), oldext.getTypeIdentifier(), group.getIdentifier()}));
-					}
+					reportReplacement((LaunchConfigurationTabGroupExtension) map.put("*", group), group); //$NON-NLS-1$
 				}
 				for(Iterator iter = modes.iterator(); iter.hasNext();) {
-					oldext = (LaunchConfigurationTabGroupExtension) map.put(iter.next(), group);
-					if(oldext != null) {
-						DebugUIPlugin.logErrorMessage(NLS.bind(LaunchConfigurationsMessages.LaunchConfigurationPresentationManager_0, 
-								new String[]{oldext.getIdentifier(), oldext.getTypeIdentifier(), group.getIdentifier()}));
-					}
+					reportReplacement((LaunchConfigurationTabGroupExtension) map.put(iter.next(), group), group);
 				}
 			}
 		}
 	}	
 	
 	/**
+	 * Reports if a tab group extension has been replaced by another contribution
+	 * @param oldext the old tab group extension from the cache
+	 * @param newext the new one being cached
+	 * 
+	 * @since 3.6
+	 */
+	void reportReplacement(LaunchConfigurationTabGroupExtension oldext, LaunchConfigurationTabGroupExtension newext) {
+		if(oldext != null) {
+			Status status = new Status(IStatus.ERROR, 
+					DebugUIPlugin.getUniqueIdentifier(), 
+					NLS.bind(LaunchConfigurationsMessages.LaunchConfigurationPresentationManager_0, 
+							new String[]{oldext.getIdentifier(), oldext.getTypeIdentifier(), newext.getIdentifier()}));
+			DebugUIPlugin.log(status);
+		}
+	}
+	
+	/**
 	 * This method is used to collect all of the contributed tabs defined by the <code>launchConfigurationTabs</code>
 	 * extension point
 	 *
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties
index d4d93d97a..b21c15b7f 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties
@@ -129,7 +129,7 @@ LaunchShortcutSelectionDialog_3=Description not available
 # or any label of a contributed ILaunchMode.
 LaunchShortcutSelectionDialog_4=&Select what to {0}:
 
-LaunchConfigurationPresentationManager_0=LaunchConfigurationTabGroupExtension {0} for {1} has been replaced by extension {2}
+LaunchConfigurationPresentationManager_0=Tab group extension: {0} for type {1} has been replaced by extension: {2}
 LaunchConfigurationPropertiesDialog_Edit_launch_configuration_properties_1=Edit launch configuration properties
 LaunchConfigurationPropertiesDialog_Properties_for__0__2=Edit Configuration