separate something out

Author: MCUmbrella

pom.xml

@@ -33,7 +33,7 @@
                     </descriptorRefs>
                     <archive>
                         <manifest>
-                            <mainClass>vip.floatationdevice.wordlehelper.Main</mainClass>
+                            <mainClass>vip.floatationdevice.wordlehelper.CLI</mainClass>
                         </manifest>
                     </archive>
                 </configuration>

src/main/java/vip/floatationdevice/wordlehelper/Main.java renamed to src/main/java/vip/floatationdevice/wordlehelper/CLI.java

@@ -1,25 +1,13 @@
 package vip.floatationdevice.wordlehelper;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
 import java.util.ArrayList;
 import java.util.NoSuchElementException;
 import java.util.Scanner;
-import java.util.regex.Pattern;
 
-public class Main
+import static vip.floatationdevice.wordlehelper.Common.*;
+
+public class CLI
 {
-    //regex: 5 letters
-    final static Pattern validWord = Pattern.compile("^[a-zA-Z]{5}$");
-    //regex: 5 letters, a space, 5 numbers
-    final static Pattern checkResult = Pattern.compile("^[a-zA-Z]{5} [0-2]{5}$");
-    //file: ./words.txt
-    final static File file = new File("words.txt");
-    //words remaining to be found
-    static ArrayList<String> words = new ArrayList<String>();
-    //how many times you want the program to try to find the word. Can be overridden by command line argument
-    static int maxTries = 6;
     //scanner for input
     final static Scanner s = new Scanner(System.in);
 
@@ -28,10 +16,7 @@ public static void main(String[] args)
         System.out.println("WordleHelper Version 1.0");
         try
         {
-            BufferedReader reader = new BufferedReader(new FileReader(file));
-            for (String line = reader.readLine(); line != null; line = reader.readLine()) //put matched words into the ArrayList
-                if (validWord.matcher(line).find()) words.add(line.toLowerCase());
-            reader.close();
+            Common.readDictionary();
         }
         catch (Exception e)
         {
@@ -51,7 +36,6 @@ public static void main(String[] args)
                 e.printStackTrace();
                 System.exit(-1);
             }
-        System.out.println("Dictionary size: " + words.size());
         System.out.println(
                 "Enter a Wordle check result with 5 letters, a space and 5 numbers from 0 to 2.\n" +
                 "Example: apple 01002\n" +

src/main/java/vip/floatationdevice/wordlehelper/Common.java

@@ -0,0 +1,31 @@
+package vip.floatationdevice.wordlehelper;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.util.ArrayList;
+import java.util.regex.Pattern;
+
+public class Common
+{
+    //regex: 5 letters
+    public final static Pattern validWord = Pattern.compile("^[a-zA-Z]{5}$");
+    //regex: 5 letters, a space, 5 numbers
+    public final static Pattern checkResult = Pattern.compile("^[a-zA-Z]{5} [0-2]{5}$");
+    //file: ./words.txt
+    public final static File file = new File("words.txt");
+    //words remaining to be found
+    public static ArrayList<String> words = new ArrayList<String>();
+    //how many times you want the program to try to find the word. Can be overridden by command line argument
+    public static int maxTries = 6;
+
+    //read words from './words.txt' and store them in ArrayList<String> words
+    public static void readDictionary() throws Exception
+    {
+        BufferedReader reader = new BufferedReader(new FileReader(file));
+        for (String line = reader.readLine(); line != null; line = reader.readLine()) //put matched words into the ArrayList
+            if (validWord.matcher(line).find()) words.add(line.toLowerCase());
+        reader.close();
+        System.out.println("Dictionary size: " + words.size());
+    }
+}

src/main/java/vip/floatationdevice/wordlehelper/GUI.java

@@ -7,7 +7,7 @@
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 
-import static vip.floatationdevice.wordlehelper.Main.*;
+import static vip.floatationdevice.wordlehelper.Common.*;
 
 public class GUI extends JFrame
 {
@@ -37,13 +37,13 @@ public class GUI extends JFrame
     //acceptable chars: 0-2, a-z, backspace
     char[] acceptableChars = "abcdefghijklmnopqrstuvwxyz012\b".toCharArray();
     //possible words field
-    private final JTextArea possibleWords=new JTextArea("Possible words will be shown here\nEnter your first 5 letters and then 5 numbers to see them\nPress the '?' button on the bottom left for help");
+    private final JTextArea possibleWords=new JTextArea("Possible words will be shown here\nEnter 5 letters and then 5 numbers to update them\nPress the '?' button to see help message\nPress the 'R' button to reset the program\n\n");
     //result board, 6 lines, 5 letters each line
     private final JLabel[][] board=new JLabel[6][5];
     //tries status
     private final JLabel tries=new JLabel("Try {}/6");
     //'words left' status
-    private final JLabel wordsLeft=new JLabel("{} words left");
+    private final JLabel wordsLeft=new JLabel();
     //[?] button that shows the help message
     private final JButton help=new JButton("?");
     //[R] button that resets the board, the tries and the possible words
@@ -90,19 +90,40 @@ public GUI()
         if(!startupComplete)
         {
             //show a startup window
+            JLabel startupText = new JLabel("Starting WordleHelper...");
+            startupText.setHorizontalAlignment(SwingConstants.CENTER);
+            startup.add(startupText);
             startup.setSize(200,50);
             startup.setLocationRelativeTo(null);
             startup.setUndecorated(true);
-            startup.setAlwaysOnTop(true);
             startup.setResizable(false);
-            JLabel startupText = new JLabel("Starting WordleHelper...");
-            startupText.setHorizontalAlignment(SwingConstants.CENTER);
-            startup.add(startupText);
+            startup.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
             startup.setVisible(true);
             /*try {
                 Thread.sleep(1000); //magic, don't touch
             }catch (InterruptedException e){}*/
         }
+        //load dictionary
+        try
+        {
+            readDictionary();
+            wordsLeft.setText(words.size() + " words left");
+            //show all words at first
+            possibleWords.append(words.toString());
+        }
+        catch (Exception e)
+        {
+            System.out.println("Error loading dictionary:");
+            e.printStackTrace();
+            //show error window
+            JOptionPane.showMessageDialog(null,
+                    "Error loading dictionary: "+e.getMessage()+
+                    "\nHave you put it under your workdir?\nYou can get the file from 'https://github.com/MCUmbrella/AWordle/tree/main/dictionary'",
+                    "Error",
+                    JOptionPane.ERROR_MESSAGE
+            );
+            System.exit(-1);
+        }
 
         //set main window
         setTitle("WordleHelper 1.1");
@@ -127,16 +148,14 @@ public GUI()
         possibleWords.setBounds(270,10,360,420);
         possibleWords.setEditable(false);
         possibleWords.setLineWrap(true);
-        //set color
-        possibleWords.setBackground(Color.GRAY);
+        possibleWords.setWrapStyleWord(true);
+        possibleWords.setBackground(new Color(96,96,96));
         possibleWords.setForeground(Color.WHITE);
         //set help and reset button
         help.setBounds(10,400,50,30);
         reset.setBounds(70,400,50,30);
         //set global key event listener
-        //help.addKeyListener(boardKeyListener);
-        KeyboardFocusManager.getCurrentKeyboardFocusManager()
-                .addKeyEventDispatcher(keyEventDispatcher);
+        if (!startupComplete) KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventDispatcher(keyEventDispatcher);
         //set help button's action listener
         help.addActionListener(new ActionListener()
         {
@@ -164,6 +183,7 @@ public void actionPerformed(ActionEvent e)
             public void actionPerformed(ActionEvent e)
             {
                 System.out.println("resetting");
+                words.clear();
                 dispose();
                 new GUI();
             }