From 97ea58c661aaab7de82201a65ed6b17133bdf7a8 Mon Sep 17 00:00:00 2001
From: Vivian Kong <vivkong@ca.ibm.com>
Date: Tue, 17 Jul 2007 13:17:21 +0000
Subject: [PATCH] fix for bug 189229 - add more info to error message when
 there's a tool conflict

---
 .../ui/properties/ToolSelectionDialog.java               | 9 +++++++++
 .../cdt/managedbuilder/ui/properties/messages.properties | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSelectionDialog.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSelectionDialog.java
index f9fd55cbfb2..20c94179595 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSelectionDialog.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSelectionDialog.java
@@ -13,6 +13,7 @@ package org.eclipse.cdt.managedbuilder.ui.properties;
 
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.List;
 
 import org.eclipse.cdt.managedbuilder.core.IFolderInfo;
 import org.eclipse.cdt.managedbuilder.core.IModificationStatus;
@@ -203,6 +204,7 @@ public class ToolSelectionDialog extends Dialog {
 			if ((c & IModificationStatus.TOOLS_CONFLICT) != 0) {
 				s = s + Messages.getString("ToolSelectionDialog.7"); //$NON-NLS-1$
 				ITool[][] tools = st.getToolsConflicts();
+				List conflictTools = new ArrayList();
 				for (int k=0; k<t2.getItemCount(); k++) {
 					TableItem ti = t2.getItem(k);
 					ITool t = (ITool)ti.getData();
@@ -210,12 +212,19 @@ public class ToolSelectionDialog extends Dialog {
 					for (int i=0;i<tools.length;i++) {
 						for (int j=0;j<tools[i].length;j++) {
 							if (t.matches(tools[i][j])) {
+								conflictTools.add(ti.getText());
 								ti.setForeground(red);
 								break loop;
 							}
 						}
 					}
 				}
+				//bug 189229 - provide more information in the error message for accessibility
+				Iterator iterator = conflictTools.iterator();
+				s = s+ " " + (String)iterator.next();
+				while (iterator.hasNext()) {
+					s = s + ", " + (String)iterator.next();
+				}
 			}
 			if ((c & IModificationStatus.TOOLS_DONT_SUPPORT_MANAGED_BUILD) != 0) {
 				s = s + Messages.getString("ToolSelectionDialog.8"); //$NON-NLS-1$
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/messages.properties b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/messages.properties
index 20eb8f6c0a3..fb65b2c63ec 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/messages.properties
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/messages.properties
@@ -7,6 +7,7 @@
 #
 # Contributors:
 #     Intel Corporation - initial API and implementation
+#	  IBM Corporation
 ###############################################################################
 BuilderSettingsTab.0=Builder
 BuilderSettingsTab.1=Builder type
@@ -52,7 +53,7 @@ DiscoveryTab.7=InfoContexts are different \!
 ToolSelectionDialog.0=Select tools
 ToolSelectionDialog.1=Available tools
 ToolSelectionDialog.2=Used tools
-ToolSelectionDialog.7=Tool conflict \! 
+ToolSelectionDialog.7=Tool conflict: 
 ToolSelectionDialog.8=Tool does not support managed build \! 
 ToolSelectionDialog.9=Props not defined \! 
 ToolSelectionDialog.10=Props not supported \!