From b853fe94bc73be2225e032c7830c7cfeb3567cce Mon Sep 17 00:00:00 2001 From: Manindra Moharana Date: Mon, 10 Jun 2013 08:15:16 +0530 Subject: [PATCH] Sorted completion list --- .../src/processing/mode/experimental/ASTGenerator.java | 2 ++ .../mode/experimental/CompletionCandidate.java | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pdex/src/processing/mode/experimental/ASTGenerator.java b/pdex/src/processing/mode/experimental/ASTGenerator.java index 6cfeb56b5..3fbd2d58f 100644 --- a/pdex/src/processing/mode/experimental/ASTGenerator.java +++ b/pdex/src/processing/mode/experimental/ASTGenerator.java @@ -16,6 +16,7 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.net.URL; import java.util.ArrayList; +import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -714,6 +715,7 @@ public class ASTGenerator { } + Collections.sort(candidates); CompletionCandidate[][] candi = new CompletionCandidate[candidates .size()][1]; diff --git a/pdex/src/processing/mode/experimental/CompletionCandidate.java b/pdex/src/processing/mode/experimental/CompletionCandidate.java index 5f3f0d740..4ff73400f 100644 --- a/pdex/src/processing/mode/experimental/CompletionCandidate.java +++ b/pdex/src/processing/mode/experimental/CompletionCandidate.java @@ -7,7 +7,7 @@ import java.util.List; import org.eclipse.jdt.core.dom.ASTNode; import org.eclipse.jdt.core.dom.MethodDeclaration; -public class CompletionCandidate { +public class CompletionCandidate implements Comparable{ private String definingClass; @@ -119,4 +119,12 @@ public class CompletionCandidate { return type; } + public int compareTo(CompletionCandidate cc) { + if(type != cc.getType()){ + return cc.getType() - type; + } + + return (elementName.compareTo(cc.getElementName())); + } + }