mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-30 21:55:31 +02:00
fix for bug 189229 - add more info to error message when there's a tool conflict
This commit is contained in:
parent
ddfec5c6d7
commit
97ea58c661
2 changed files with 11 additions and 1 deletions
|
@ -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$
|
||||
|
|
|
@ -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 \!
|
||||
|
|
Loading…
Add table
Reference in a new issue