mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Bug # 201604 "Available tools" problem and enhauncements

Browse source
This commit is contained in:
Oleg Krasilnikov 2007-08-30 11:41:23 +00:00
parent 99cf14ce66
commit 3d8345fd13
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildListComparator.java
View file

@ -35,7 +35,7 @@ public class BuildListComparator extends CDTListComparator {
if (s1 == null) s1 = ""; //$NON-NLS-1$ if (s1 == null) s1 = ""; //$NON-NLS-1$
String s2 = c2.getName(); String s2 = c2.getName();
if (s2 == null) s2 = ""; //$NON-NLS-1$ if (s2 == null) s2 = ""; //$NON-NLS-1$
return s2.compareToIgnoreCase(s2); return s1.compareToIgnoreCase(s2);
} }
if (a instanceof IBuildPropertyValue) { if (a instanceof IBuildPropertyValue) {
IBuildPropertyValue c1 = (IBuildPropertyValue)a; IBuildPropertyValue c1 = (IBuildPropertyValue)a;

11
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSelectionDialog.java
View file

@ -12,6 +12,7 @@
package org.eclipse.cdt.managedbuilder.ui.properties; package org.eclipse.cdt.managedbuilder.ui.properties;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@ -47,7 +48,8 @@ public class ToolSelectionDialog extends Dialog {
private CLabel errorLabel; private CLabel errorLabel;
public ITool[] all, used; public ITool[] all, used;
public IFolderInfo fi; public IFolderInfo fi;
ArrayList added, removed, left, right; ArrayList added, removed;
private ArrayList left, right;
Font boldFont = JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT); Font boldFont = JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT);
Color red; Color red;
@ -165,6 +167,9 @@ public class ToolSelectionDialog extends Dialog {
added.clear(); added.clear();
t1.removeAll(); t1.removeAll();
t2.removeAll(); t2.removeAll();
Collections.sort(left, BuildListComparator.getInstance());
Iterator it = left.iterator(); Iterator it = left.iterator();
while(it.hasNext()) { while(it.hasNext()) {
ITool t = (ITool)it.next(); 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 //bug 189229 - provide more information in the error message for accessibility
Iterator iterator = conflictTools.iterator(); Iterator iterator = conflictTools.iterator();
s = s+ " " + (String)iterator.next(); s = s+" "+ (String)iterator.next(); //$NON-NLS-1$
while (iterator.hasNext()) { 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) { if ((c & IModificationStatus.TOOLS_DONT_SUPPORT_MANAGED_BUILD) != 0) {