From 3d8345fd13e76c422b17f946b85a6cacfcd40c9a Mon Sep 17 00:00:00 2001
From: Oleg Krasilnikov <oleg.krasilnikov@intel.com>
Date: Thu, 30 Aug 2007 11:41:23 +0000
Subject: [PATCH] Bug # 201604 "Available tools" problem and enhauncements

---
 .../ui/properties/BuildListComparator.java            |  2 +-
 .../ui/properties/ToolSelectionDialog.java            | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildListComparator.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildListComparator.java
index f821fe3b4d9..27721294d31 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildListComparator.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildListComparator.java
@@ -35,7 +35,7 @@ public class BuildListComparator extends CDTListComparator {
 			if (s1 == null) s1 = "";  //$NON-NLS-1$
 			String s2 = c2.getName();
 			if (s2 == null) s2 = "";  //$NON-NLS-1$ 
-			return s2.compareToIgnoreCase(s2);
+			return s1.compareToIgnoreCase(s2);
 		}
 		if (a instanceof IBuildPropertyValue) {
 			IBuildPropertyValue c1 = (IBuildPropertyValue)a;
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 20c94179595..083b40a5729 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
@@ -12,6 +12,7 @@
 package org.eclipse.cdt.managedbuilder.ui.properties;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
@@ -47,7 +48,8 @@ public class ToolSelectionDialog extends Dialog {
 	private CLabel errorLabel;
 	public ITool[] all, used;
 	public IFolderInfo fi;
-	ArrayList added, removed, left, right;
+	ArrayList added, removed; 
+	private ArrayList left, right;
 	Font boldFont = JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT);
 	Color red;
 	
@@ -165,6 +167,9 @@ public class ToolSelectionDialog extends Dialog {
 		added.clear();
 		t1.removeAll();
 		t2.removeAll();
+		
+		Collections.sort(left, BuildListComparator.getInstance());
+		
 		Iterator it = left.iterator();
 		while(it.hasNext()) {
 			ITool t = (ITool)it.next();
@@ -221,9 +226,9 @@ public class ToolSelectionDialog extends Dialog {
 				}
 				//bug 189229 - provide more information in the error message for accessibility
 				Iterator iterator = conflictTools.iterator();
-				s = s+ " " + (String)iterator.next();
+				s = s+" "+ (String)iterator.next(); //$NON-NLS-1$
 				while (iterator.hasNext()) {
-					s = s + ", " + (String)iterator.next();
+					s = s + ", " + (String)iterator.next(); //$NON-NLS-1$
 				}
 			}
 			if ((c & IModificationStatus.TOOLS_DONT_SUPPORT_MANAGED_BUILD) != 0) {