Merge pull request #15 from ehermellin/master

Add Highlight and fix open/save issue

Author: pH-7

src/simplejavatexteditor/HighlightText.java

@@ -0,0 +1,42 @@
+package simplejavatexteditor;
+
+import javax.swing.text.*;
+import java.awt.*;
+
+public class HighlightText extends DefaultHighlighter.DefaultHighlightPainter{
+
+    public HighlightText(Color color) {
+        super(color);
+    }
+
+    public void highLight(JTextComponent textComp, String[] pattern) {
+        removeHighlights(textComp);
+
+        try {
+            Highlighter hilite = textComp.getHighlighter();
+            Document doc = textComp.getDocument();
+            String text = doc.getText(0, doc.getLength());
+            for (int i = 0; i < pattern.length; i++) {
+                int pos = 0;
+
+                while ((pos = text.indexOf(pattern[i], pos)) >= 0) {
+                    hilite.addHighlight(pos, pos + pattern[i].length(), this);
+                    pos += pattern[i].length();
+                }
+            }
+        } catch (BadLocationException e) {}
+
+    }
+
+    public void removeHighlights(JTextComponent textComp) {
+
+        Highlighter hilite = textComp.getHighlighter();
+        Highlighter.Highlight[] hilites = hilite.getHighlights();
+
+        for (int i = 0; i < hilites.length; i++) {
+            if (hilites[i].getPainter() instanceof HighlightText) {
+                hilite.removeHighlight(hilites[i]);
+            }
+        }
+    }
+}

src/simplejavatexteditor/SupportedKeywords.java

@@ -12,6 +12,8 @@
  */
 public class SupportedKeywords {
 
+    private String[] supportedLangage = {".cpp",".java"};
+
     private String[] java = {"abstract", "assert", "boolean",
             "break", "byte", "case", "catch", "char", "class", "const",
             "continue", "default", "do", "double", "else", "extends", "false",
@@ -31,6 +33,10 @@ public class SupportedKeywords {
                 "template", "typename", "class", "friend", "private", "this", "using", "const_cast",
                 "inline", "public", "throw", "virtual", "delete", "mutable", "protected", "true", "wchar_t" };
 
+    public String[] getSupportedLangage() {
+        return supportedLangage;
+    }
+
     private String[] brackets = { "{", "(" };
     private String[] bCompletions = { "}", ")" };
     public String[] getJavaKeywords() {

src/simplejavatexteditor/UI.java

@@ -24,10 +24,7 @@
 import javax.swing.*;
 import javax.swing.border.Border;
 import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.InputEvent;
-import java.awt.event.KeyEvent;
+import java.awt.event.*;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileReader;
@@ -49,8 +46,6 @@ public class UI extends JFrame implements ActionListener {
     JButton newButton, openButton, saveButton, clearButton, quickButton, aboutMeButton, aboutButton, closeButton;
     private final Action selectAllAction;
 
-
-
     // setup icons - File Menu
     private final ImageIcon newIcon = new ImageIcon("icons/new.png");
     private final ImageIcon openIcon = new ImageIcon("icons/open.png");
@@ -72,6 +67,8 @@ public class UI extends JFrame implements ActionListener {
     private final ImageIcon aboutMeIcon = new ImageIcon("icons/about_me.png");
     private final ImageIcon aboutIcon = new ImageIcon("icons/about.png");
 
+    private SupportedKeywords kw = new SupportedKeywords();
+    private HighlightText languageHighlighter = new HighlightText(Color.GRAY);
     AutoComplete autocomplete;
     private boolean hasListener = false;
 
@@ -99,6 +96,14 @@ public UI()
         /* SETTING BY DEFAULT WORD WRAP ENABLED OR TRUE */
         textArea.setLineWrap(true);
 
+        // Set an higlighter to the JTextArea
+        textArea.addKeyListener(new KeyAdapter() {
+            public void keyPressed(KeyEvent ke) {
+                languageHighlighter.highLight(textArea, kw.getCppKeywords());
+                languageHighlighter.highLight(textArea, kw.getJavaKeywords());
+            }
+        });
+
         // This is why we didn't have to worry about the size of the TextArea!
         getContentPane().setLayout(new BorderLayout()); // the BorderLayout bit makes it fill it automatically
         getContentPane().add(textArea);
@@ -128,8 +133,6 @@ public UI()
 
         menuBar.add(menuAbout);
 
-
-
         this.setJMenuBar(menuBar);
 
         // Set Actions:
@@ -364,13 +367,43 @@ public void actionPerformed(ActionEvent ev)
         //FONT SIZE SETTINGS SECTION END
     }
 
-
-
     // Make the TextArea available to the autocomplete handler
     protected JTextArea getEditor() {
         return textArea;
     }
 
+    // Enable autocomplete option
+    public void enableAutoComplete(File file) {
+        if (hasListener) {
+            textArea.getDocument().removeDocumentListener(autocomplete);
+            hasListener = false;
+        }
+
+        ArrayList<String> arrayList;
+        String[] list = kw.getSupportedLangage();
+
+        for (int i = 0; i < list.length; i++) {
+            if (file.getName().endsWith(list[i])) {
+                switch (i) {
+                    case 0:
+                        String[] jk = kw.getJavaKeywords();
+                        arrayList = kw.setKeywords(jk);
+                        autocomplete = new AutoComplete(this, arrayList);
+                        textArea.getDocument().addDocumentListener(autocomplete);
+                        hasListener = true;
+                        break;
+                    case 1:
+                        String[] ck = kw.getCppKeywords();
+                        arrayList = kw.setKeywords(ck);
+                        autocomplete = new AutoComplete(this, arrayList);
+                        textArea.getDocument().addDocumentListener(autocomplete);
+                        hasListener = true;
+                        break;
+                }
+            }
+        }
+    }
+
     public void actionPerformed (ActionEvent e) {
         // If the source of the event was our "close" option
         if (e.getSource() == close || e.getSource() == closeButton) {
@@ -394,11 +427,13 @@ else if (e.getSource() == openFile || e.getSource() == openButton) {
             if (option == JFileChooser.APPROVE_OPTION) {
                 FEdit.clear(textArea); // clear the TextArea before applying the file contents
                 try {
-                    // create a scanner to read the file (getSelectedFile().getPath() will get the path to the file)
-                    Scanner scan = new Scanner(new FileReader(open.getSelectedFile().getPath()));
-                    while (scan.hasNext()) // while there's still something to
-                                            // read
-                        textArea.append(scan.nextLine() + "\n"); // append the line to the TextArea
+                    File openFile = open.getSelectedFile();
+                    setTitle(openFile.getName() + " | " + SimpleJavaTextEditor.NAME);
+                    Scanner scan = new Scanner(new FileReader(openFile.getPath()));
+                    while (scan.hasNext())
+                        textArea.append(scan.nextLine() + "\n");
+
+                    enableAutoComplete(openFile);
                 } catch (Exception ex) { // catch any exceptions, and...
                     // ...write to the debug console
                     System.out.println(ex.getMessage());
@@ -418,54 +453,15 @@ else if (e.getSource() == saveFile || e.getSource() == saveButton) {
              */
             if (option == JFileChooser.APPROVE_OPTION) {
                 try {
-                    File file = fileChoose.getSelectedFile();
-                    // Set the new title of the window
-                    setTitle(file.getName() + " | " + SimpleJavaTextEditor.NAME);
-                    // Create a buffered writer to write to a file
-                    BufferedWriter out = new BufferedWriter(new FileWriter(file.getPath()));
-                    // Write the contents of the TextArea to the file
+                    File openFile = fileChoose.getSelectedFile();
+                    setTitle(openFile.getName() + " | " + SimpleJavaTextEditor.NAME);
+
+                    BufferedWriter out = new BufferedWriter(new FileWriter(openFile.getPath()));
                     out.write(textArea.getText());
-                    // Close the file stream
                     out.close();
 
-                    //If the user saves files with supported
-                    //file types more than once, we need to remove
-                    //previous listeners to avoid bugs.
-                    if(hasListener) {
-                        textArea.getDocument().removeDocumentListener(autocomplete);
-                        hasListener = false;
-                    }
-
-                    //With the keywords located in a separate class,
-                    //we can support multiple languages and not have to do
-                    //much to add new ones.
-                    SupportedKeywords kw = new SupportedKeywords();
-                    ArrayList<String> arrayList;
-                    String[] list = { ".java", ".cpp" };
-
-                    //Iterate through the list, find the supported
-                    //file extension, apply the appropriate getter method from
-                    //the keyword class
-                    for(int i = 0; i < list.length; i++) {
-                        if(file.getName().endsWith(list[i])) {
-                            switch(i) {
-                                case 0:
-                                    String[] jk = kw.getJavaKeywords();
-                                    arrayList = kw.setKeywords(jk);
-                                    autocomplete = new AutoComplete(this, arrayList);
-                                    textArea.getDocument().addDocumentListener(autocomplete);
-                                    hasListener = true;
-                                    break;
-                                case 1:
-                                    String[] ck = kw.getCppKeywords();
-                                    arrayList = kw.setKeywords(ck);
-                                    autocomplete = new AutoComplete(this, arrayList);
-                                    textArea.getDocument().addDocumentListener(autocomplete);
-                                    hasListener = true;
-                                    break;
-                            }
-                        }
-                    }
+                    enableAutoComplete(openFile);
+
                 } catch (Exception ex) { // again, catch any exceptions and...
                     // ...write to the debug console
                     System.out.println(ex.getMessage());