Get rid of AutoCompletionListener infrastructure

This name AutoCompletionListener is already taken by
org.fife.ui.autocomplete, and it means something else.
Let's not conflate the terminology here.

For now, let's keep things simple, just registering and using the
JythonAutoCompletions directly, rather than trying to make it extensible
via a non-SciJava-based mechanism. If we need extensibility of
autocompletions later, we can introduce a new SciJava plugin type in the
script-editor component, and then rework this component to use it.

Author: ctrueden

src/main/java/org/scijava/plugins/scripteditor/jython/JythonAutoCompletions.java

@@ -41,14 +41,8 @@
 import org.fife.ui.autocomplete.Completion;
 import org.fife.ui.autocomplete.CompletionProvider;
 import org.python.indexer.types.NModuleType;
-import org.scijava.ui.swing.script.autocompletion.AutoCompletionListener;
 
-public class JythonAutoCompletions implements AutoCompletionListener
-{
-	static {
-		// Register as listener for jython autocompletions
-		JythonAutocompletionProvider.addAutoCompletionListener(new JythonAutoCompletions());
-	}
+public class JythonAutoCompletions {
 
 	static private final Pattern assign = Pattern.compile("^([ \\t]*)(([a-zA-Z_][a-zA-Z0-9_ \\t,]*)[ \\t]+=[ \\t]+(.*))$"),
 						         nameToken = Pattern.compile("^(.*?[ \\t]+|)([a-zA-Z_][a-zA-Z0-9_]+)$"),
@@ -98,7 +92,6 @@ public List<String> apply(final Path filepath) {
 
 	public JythonAutoCompletions() {}
 
-	@Override
 	public List<Completion> completionsFor(final CompletionProvider provider, String codeWithoutLastLine, final String lastLine, final String alreadyEnteredText) {
 
 		// Replacing of text will start at crop, given the already entered text that is considered for replacement

src/main/java/org/scijava/plugins/scripteditor/jython/JythonAutocompletionProvider.java

@@ -31,7 +31,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Vector;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -44,25 +43,13 @@
 import org.fife.ui.autocomplete.Completion;
 import org.fife.ui.autocomplete.DefaultCompletionProvider;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
-import org.scijava.ui.swing.script.autocompletion.AutoCompletionListener;
 import org.scijava.ui.swing.script.autocompletion.ClassUtil;
 import org.scijava.ui.swing.script.autocompletion.ImportCompletionImpl;
 import org.scijava.ui.swing.script.autocompletion.ImportFormat;
 
 public class JythonAutocompletionProvider extends DefaultCompletionProvider {
 
-	static private final Vector<AutoCompletionListener> autocompletion_listeners = new Vector<>();
-	
-	static {
-		try {
-			// Load the class so that it adds itself to the autocompletion_listeners
-			@SuppressWarnings("unused")
-			Class<?> c = JythonAutoCompletions.class;
-		} catch (Throwable t) {
-			System.out.println("WARNING did not load JythonAutoCompletions");
-		}
-	}
-	
+	private final JythonAutoCompletions autoCompletions = new JythonAutoCompletions();
 	private final RSyntaxTextArea text_area;
 	private final ImportFormat formatter;
 
@@ -101,15 +88,6 @@ private final List<Completion> asCompletionList(final Stream<String> stream, fin
 				.collect(Collectors.toList());
 	}
 
-	static public void addAutoCompletionListener(final AutoCompletionListener listener) {
-		if (!autocompletion_listeners.contains(listener))
-			autocompletion_listeners.add(listener);
-	}
-	
-	static public void removeAutoCompletionListener(final AutoCompletionListener listener) {
-		autocompletion_listeners.remove(listener);
-	}
-	
 	@Override
 	public List<Completion> getCompletionsImpl(final JTextComponent comp) {
 		final ArrayList<Completion> completions = new ArrayList<>();
@@ -126,15 +104,13 @@ public List<Completion> getCompletionsImpl(final JTextComponent comp) {
 			return completions;
 		}
 		// Completions provided by listeners (e.g. for methods and fields and variables and builtins from jython-autocompletion package)
-		for (final AutoCompletionListener listener: new Vector<>(autocompletion_listeners)) {
-			try {
-				final List<Completion> cs = listener.completionsFor(this, codeWithoutLastLine, currentLine, alreadyEnteredText);
-				if (null != cs)
-					completions.addAll(cs);
-			} catch (Exception e) {
-				System.out.println("Failed to get autocompletions from " + listener);
-				e.printStackTrace();
-			}
+		try {
+			final List<Completion> cs = autoCompletions.completionsFor(this, codeWithoutLastLine, currentLine, alreadyEnteredText);
+			if (cs != null) completions.addAll(cs);
+		}
+		catch (Exception e) {
+			System.out.println("Failed to get autocompletions from " + autoCompletions);
+			e.printStackTrace();
 		}
 		// Java class discovery for completions with auto-imports
 		completions.addAll(getCompletions(alreadyEnteredText));