Author: vrubezhny Date: 2008-12-03 13:55:59 -0500 (Wed, 03 Dec 2008) New Revision: 12257 Modified: trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbProposal.java Log: JBIDE-3133 New icons for proposals in JSF/Seam Code Assist. The icons support and a set of common icons are added to the KB. Modified: trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbProposal.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbProposal.java 2008-12-03 18:50:50 UTC (rev 12256) +++ trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbProposal.java 2008-12-03 18:55:59 UTC (rev 12257) @@ -11,6 +11,7 @@ package org.jboss.tools.common.kb; import java.io.Serializable; +import java.util.Comparator; import org.eclipse.swt.graphics.Image; @@ -287,4 +288,29 @@ if(postProcessing != null) postProcessing.process(this, value, offset); } + public static final Comparator<KbProposal> KB_PROPOSAL_ORDER + = new KbProposalComparator(); + + private static class KbProposalComparator implements Comparator<KbProposal> { + + public int compare(KbProposal p1, KbProposal p2) { + int n1=p1.replacementString.length(), n2=p2.replacementString.length(); + for (int i1=0, i2=0; i1<n1 && i2<n2; i1++, i2++) { + char c1 = p1.replacementString.charAt(i1); + char c2 = p2.replacementString.charAt(i2); + if (c1 != c2) { + c1 = Character.toUpperCase(c1); + c2 = Character.toUpperCase(c2); + if (c1 != c2) { + c1 = Character.toLowerCase(c1); + c2 = Character.toLowerCase(c2); + if (c1 != c2) { + return c1 - c2; + } + } + } + } + return n1 - n2; + } + } } \ No newline at end of file