diff --git a/java/src/processing/mode/java/CompletionCandidate.java b/java/src/processing/mode/java/CompletionCandidate.java index 97971f519..9dd29ed75 100644 --- a/java/src/processing/mode/java/CompletionCandidate.java +++ b/java/src/processing/mode/java/CompletionCandidate.java @@ -33,10 +33,10 @@ import org.eclipse.jdt.core.dom.VariableDeclarationFragment; // TODO when building the label in some variants in this file, -// getReturnType2() is used instead of getReturnType(). -// need to check whether that's identical in how it performs, -// and if so, use makeLabel() and makeCompletion() more [fry 180326] -// https://help.eclipse.org/neon/index.jsp?topic=%2Forg.eclipse.jdt.doc.isv%2Freference%2Fapi%2Forg%2Feclipse%2Fjdt%2Fcore%2Fdom%2FMethodDeclaration.html +// getReturnType2() is used instead of getReturnType(). +// need to check whether that's identical in how it performs, +// and if so, use makeLabel() and makeCompletion() more [fry 180326] +// https://help.eclipse.org/neon/index.jsp?topic=%2Forg.eclipse.jdt.doc.isv%2Freference%2Fapi%2Forg%2Feclipse%2Fjdt%2Fcore%2Fdom%2FMethodDeclaration.html public class CompletionCandidate implements Comparable { private final String elementName; @@ -56,7 +56,7 @@ public class CompletionCandidate implements Comparable { CompletionCandidate(Method method) { // return value ignored? [fry 180326] - method.getDeclaringClass().getName(); + //method.getDeclaringClass().getName(); elementName = method.getName(); label = makeLabel(method); completion = makeCompletion(method); @@ -140,7 +140,7 @@ public class CompletionCandidate implements Comparable { CompletionCandidate(Field f) { - f.getDeclaringClass().getName(); + //f.getDeclaringClass().getName(); elementName = f.getName(); type = PREDEF_FIELD; label = "" + @@ -171,9 +171,11 @@ public class CompletionCandidate implements Comparable { } + /* Object getWrappedObject() { return wrappedObject; } + */ public String getElementName() { @@ -288,7 +290,8 @@ public class CompletionCandidate implements Comparable { } labelBuilder.append(')'); if (method.getReturnType() != null) { - labelBuilder.append(" : " + method.getReturnType().getSimpleName()); + labelBuilder.append(" : "); + labelBuilder.append(method.getReturnType().getSimpleName()); } labelBuilder.append(" - "); diff --git a/java/src/processing/mode/java/CompletionGenerator.java b/java/src/processing/mode/java/CompletionGenerator.java index 96dae0d77..41227608c 100644 --- a/java/src/processing/mode/java/CompletionGenerator.java +++ b/java/src/processing/mode/java/CompletionGenerator.java @@ -1333,19 +1333,12 @@ public class CompletionGenerator { */ public static class ClassMember { private Field field; - private Method method; - private Constructor cons; - private Class thisclass; - private String stringVal; - private String classType; - private ASTNode astNode; - private ASTNode declaringNode; public ClassMember(Class m) {