Consolidate redundant code.

Author: acardona

src/main/java/org/scijava/jython/autocompletion/DotAutocompletions.java

@@ -23,6 +23,7 @@
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -57,5 +58,34 @@ static public List<CompletionText> getPublicFieldsAndMethods(final String classN
 		}
 		return ac;
 	}
+	
+
+	/** Collect static fields and static methods from {@code c} into {@code ac}.
+	 * 
+	 * @param c
+	 * @param ac
+	 */
+	static public void staticFieldsAndStaticMethodsInto(final Class<?> c, final List<CompletionText> ac) {
+		for (final Field f: c.getDeclaredFields())
+			if (Modifier.isStatic(f.getModifiers()))
+				ac.add(new CompletionText(f.getName(), c, f));
+		for (final Method m: c.getDeclaredMethods())
+			if (Modifier.isStatic(m.getModifiers()))
+				ac.add(new CompletionText(m.getName() + "()", c, m)); // TODO could do a parameter-driven autocompletion
+	}
+
+	/** Collect non-static fields and non-static methods of class {@code c} into {@code ac}.
+	 * 
+	 * @param c
+	 * @param ac
+	 */
+	static public void fieldsAndMethodsInto(final Class<?> c, final List<CompletionText> ac) {
+		for (final Field f: c.getDeclaredFields())
+			if (!Modifier.isStatic(f.getModifiers()))
+				ac.add(new CompletionText(f.getName(), c, f));
+		for (final Method m: c.getDeclaredMethods())
+			if (!Modifier.isStatic(m.getModifiers()))
+				ac.add(new CompletionText(m.getName() + "()", c, m)); // TODO could do a parameter-driven autocompletion
+	}
 
 }

src/main/java/org/scijava/jython/autocompletion/StaticDotAutocompletions.java

@@ -21,9 +21,6 @@
  */
 package org.scijava.jython.autocompletion;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -61,7 +58,7 @@ public List<CompletionText> get() {
 				}
 				// Or a java class:
 				try {
-					fieldsAndStaticMethodsInto(Class.forName(this.className), ac);
+					DotAutocompletions.staticFieldsAndStaticMethodsInto(Class.forName(this.className), ac);
 					return ac;
 				} catch (ClassNotFoundException cnfe) {
 					msg += "\nCannot find java class " + this.className;
@@ -77,7 +74,7 @@ public List<CompletionText> get() {
 							.map(m -> m.getReturnType())
 							.distinct()
 							.collect(Collectors.toList())) {
-						fieldsAndMethodsInto(r, ac);
+						DotAutocompletions.fieldsAndMethodsInto(r, ac);
 					}
 					return ac;
 				} catch (ClassNotFoundException cnfe) {
@@ -94,24 +91,6 @@ public List<CompletionText> get() {
 		}
 		return ac;
 	}
-
-	private void fieldsAndStaticMethodsInto(final Class<?> c, final List<CompletionText> ac) {
-		for (final Field f: c.getDeclaredFields())
-			if (Modifier.isStatic(f.getModifiers()))
-				ac.add(new CompletionText(f.getName(), c, f));
-		for (final Method m: c.getDeclaredMethods())
-			if (Modifier.isStatic(m.getModifiers()))
-				ac.add(new CompletionText(m.getName() + "()", c, m)); // TODO could do a parameter-driven autocompletion
-	}
-
-	private void fieldsAndMethodsInto(final Class<?> c, final List<CompletionText> ac) {
-		for (final Field f: c.getDeclaredFields())
-			if (!Modifier.isStatic(f.getModifiers()))
-				ac.add(new CompletionText(f.getName(), c, f));
-		for (final Method m: c.getDeclaredMethods())
-			if (!Modifier.isStatic(m.getModifiers()))
-				ac.add(new CompletionText(m.getName() + "()", c, m)); // TODO could do a parameter-driven autocompletion
-	}
 
 	@Override
 	public String toString() {

src/main/java/org/scijava/jython/autocompletion/VarDotAutocompletions.java

@@ -21,8 +21,6 @@
  */
 package org.scijava.jython.autocompletion;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -40,15 +38,12 @@ public String getClassname() {
 	@Override
 	public List<CompletionText> get() {
 		final List<CompletionText> ac = new ArrayList<>();
-		if (null != this.className) {
+		if (null != className) {
 			try {
-				final Class<?> c = Class.forName(this.className);
-				for (final Field f: c.getFields())
-					ac.add(new CompletionText(f.getName(), c, f));
-				for (final Method m: c.getMethods())
-					ac.add(new CompletionText(m.getName() + "()", c, m)); // TODO could do a parameter-driven autocompletion
-			} catch (Exception e) {
-				e.printStackTrace();
+				final Class<?> c = Class.forName(className);
+				DotAutocompletions.fieldsAndMethodsInto(c, ac);
+			} catch (final Exception e) {
+				System.out.println("Could not load class " + className + " :: " + e.getMessage());
 			}
 		}
 		return ac;