Attachment 67468 Details for Bug 187223 – Better patch

[patch] Better patch

patch_187223.txt (text/plain), 1.68 KB, created by Olivier Thomann

on 2007-05-16 13:59:08 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2007-05-16 13:59:08 EDT

Size: 1.68 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core.tests.model
>Index: src/org/eclipse/jdt/core/tests/model/CompletionTestsRequestor2.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTestsRequestor2.java,v
>retrieving revision 1.21
>diff -u -r1.21 CompletionTestsRequestor2.java
>--- src/org/eclipse/jdt/core/tests/model/CompletionTestsRequestor2.java	6 Mar 2007 04:43:20 -0000	1.21
>+++ src/org/eclipse/jdt/core/tests/model/CompletionTestsRequestor2.java	16 May 2007 17:58:45 -0000
>@@ -173,16 +173,19 @@
> 		if(this.proposalsPtr < 0) return "";
> 		Arrays.sort(this.proposals, new Comparator() {
> 			public int compare(Object o1, Object o2) {
>-				if (o1 instanceof CompletionProposal && o2 instanceof CompletionProposal) {
>-					CompletionProposal p1 = (CompletionProposal) o1;
>-					CompletionProposal p2 = (CompletionProposal) o2;
>-					int relDif = p2.getRelevance() - p1.getRelevance();
>-					if(relDif != 0)  return relDif;
>-					String name1 = getElementName(p1);
>-					String name2 = getElementName(p2);
>-					return name1.compareTo(name2);
>-				}
>-				return -1;
>+				if (o1 == o2) 
>+					return 0;
>+				if (o1 == null)
>+					return 1;
>+				if (o2 == null)
>+					return -1;
>+				CompletionProposal p1 = (CompletionProposal) o1;
>+				CompletionProposal p2 = (CompletionProposal) o2;
>+				int relDif = p2.getRelevance() - p1.getRelevance();
>+				if(relDif != 0) return relDif;
>+				String name1 = getElementName(p1);
>+				String name2 = getElementName(p2);
>+				return name1.compareTo(name2);
> 			}
> 		});
> 		return getResultsWithoutSorting();

Actions: View | Diff

Attachments on bug 187223: 67444 | 67468