Code Completion Improvements

I want to make the editor supportive of multiple languages. Putting the
keywords in a separate class and going to add more languages. Code to
handle the different languages added to UI.java. I’m not finished yet,
need to do some clean up/documenting. This works though.

Author: patrick-slagle

src/simplejavatexteditor/JavaAutoComplete.java

@@ -36,22 +36,12 @@
 public class JavaAutoComplete
         implements DocumentListener {
 
-    private static String[] keywords = {"abstract", "assert", "boolean",
-        "break", "byte", "case", "catch", "char", "class", "const",
-        "continue", "default", "do", "double", "else", "extends", "false",
-        "final", "finally", "float", "for", "goto", "if", "implements",
-        "import", "instanceof", "int", "System", "out", "print()", "println()",
-        "new", "null", "package", "private", "protected", "public", "interface",
-        "long", "native", "return", "short", "static", "strictfp", "super", "switch",
-        "synchronized", "this", "throw", "throws", "transient", "true",
-        "try", "void", "volatile", "while", "String"};
-
-    private static String[] bracketChars = {"{", "("};
-    private static String[] bCompletions = {"}", ")"};
-    private ArrayList<String> words = new ArrayList<>();
     private ArrayList<String> brackets = new ArrayList<>();
     private ArrayList<String> bracketCompletions = new ArrayList<>();
 
+    private ArrayList<String> words = new ArrayList<>();
+
+    SupportedKeywords kw;
     //Keep track of when code completion
     //has been activated
     private enum Mode {
@@ -68,6 +58,16 @@ private enum Mode {
     private String content;
 
     public JavaAutoComplete(UI ui) {
+        this.ui = ui;
+        textArea = ui.getEditor();
+    }
+
+    public JavaAutoComplete(UI ui, ArrayList<String> al) {
+        words = al;
+        kw = new SupportedKeywords();
+        brackets = kw.getbrackets();
+        bracketCompletions = kw.getbracketCompletions();
+
         //Access the editor
         this.ui = ui;
         textArea = ui.getEditor();
@@ -78,19 +78,16 @@ public JavaAutoComplete(UI ui) {
         im.put(KeyStroke.getKeyStroke("ENTER "), COMMIT_ACTION);
         am.put(COMMIT_ACTION, new CommitAction());
 
-        //Set up the keywords
-        for (String keyList : keywords) {
-            words.add(keyList);
-        }
-        for (String bracket : bracketChars) {
-            brackets.add(bracket);
-        }
-        for (String comp : bCompletions) {
-            bracketCompletions.add(comp);
-        }
-        Collections.sort(words, null);
+        Collections.sort(words);
     }
 
+    /**
+     * A character has been typed into the document.
+     * This method performs the primary
+     * check to find a keyword completion.
+     *
+     * @param e
+     */
     @Override
     public void insertUpdate(DocumentEvent e) {
         pos = e.getOffset();
@@ -209,7 +206,8 @@ public void run() {
     }
 
     /**
-     * Enter key is pressed in response to an auto complete suggestion. Respond
+     * Enter key is pressed in response to an
+     * auto complete suggestion. Respond
      * appropriately.
      */
     private class CommitAction
@@ -284,4 +282,7 @@ public void removeUpdate(DocumentEvent e) {
     public void changedUpdate(DocumentEvent e) {
     }
 
-}
+    public void removeListener() {
+        textArea.getDocument().removeDocumentListener(this);
+    }
+}

src/simplejavatexteditor/SupportedKeywords.java

@@ -0,0 +1,54 @@
+package simplejavatexteditor;
+
+import java.util.ArrayList;
+
+public class SupportedKeywords {
+    private String[] java = {"abstract", "assert", "boolean",
+            "break", "byte", "case", "catch", "char", "class", "const",
+            "continue", "default", "do", "double", "else", "extends", "false",
+            "final", "finally", "float", "for", "goto", "if", "implements",
+            "import", "instanceof", "int", "System", "out", "print()", "println()",
+            "new", "null", "package", "private", "protected", "public", "interface",
+            "long", "native", "return", "short", "static", "strictfp", "super", "switch",
+            "synchronized", "this", "throw", "throws", "transient", "true",
+            "try", "void", "volatile", "while", "String"};
+
+    private String[] cpp = { "auto", "const", "double", "float", "int", "short",
+                "struct", "unsigned", "break", "continue", "else", "for", "long", "signed",
+                "switch", "void", "case", "default", "enum", "goto", "register", "sizeof",
+                "typedef", "volatile", "char", "do", "extern", "if", "return", "static",
+                "union", "while", "asm", "dynamic_cast", "namespace", "reinterpret_cast", "try",
+                "bool", "explicit", "new", "static_cast", "typeid", "catch", "false", "operator",
+                "template", "typename", "class", "friend", "private", "this", "using", "const_cast", "inline",
+                "public", "throw", "virtual", "delete", "mutable", "protected", "true", "wchar_t", };
+
+    private String[] brackets = { "{", "(" };
+    private String[] bCompletions = { "}", ")" };
+    public String[] getJavaKeywords() {
+        return java;
+    }
+    public String[] getCppKeywords() {
+        return cpp;
+    }
+    public ArrayList<String> getbracketCompletions() {
+        ArrayList<String> alist = new ArrayList<>();
+        for(String completion : bCompletions) {
+            alist.add(completion);
+        }
+        return alist;
+    }
+    public ArrayList<String> getbrackets() {
+        ArrayList<String> alist = new ArrayList<>();
+        for(String completion : brackets) {
+            alist.add(completion);
+        }
+        return alist;
+    }
+    public ArrayList<String> setKeywords(String[] arr) {
+        ArrayList<String> al = new ArrayList<>();
+        for(String words : arr) {
+            al.add(words);
+        }
+        return al;
+    }
+}