testing broadcast game

html/index.html

@@ -264,8 +264,12 @@ <h1>LEADERBOARD</h1>
             msg = evt.data;
             let obj = JSON.parse(msg);
 
+            if('grid' in obj){
+                console.log(obj.grid);
+            }
+
             console.log("Message received: " + msg);
-            console.log("NUM USERS: " + obj.length)
+            console.log("NUM USERS: " + obj.length);
 
             obj.forEach(function(obj){
                 console.log("OBJECT: " + obj)

src/main/java/com/cse3310/App.java

@@ -43,6 +43,30 @@ public App(int port, Draft_6455 draft){
 
     @Override
     public void onOpen(WebSocket conn, ClientHandshake handshake) {
+
+        String filename = "words.txt";
+        //Read in file of words
+        ArrayList<String> wordList = new ArrayList<>();
+        try(BufferedReader br = new BufferedReader(new FileReader(filename)))
+        {
+            String line;
+            while((line = br.readLine()) != null)
+            {
+                wordList.add(line.trim());
+            }
+
+        }
+        catch (IOException e)
+        {
+            System.err.println("Error reading file:"+ e.getMessage());
+        }
+        GsonBuilder builder = new GsonBuilder();
+        Gson gson = builder.create();
+        Game g = new Game(wordList);
+        String jsonString = gson.toJson(g);
+        System.out.println(jsonString);
+        broadcast(jsonString);
+
         System.out.println(conn.getRemoteSocketAddress().getAddress().getHostAddress() + " connected");
     }
 
@@ -61,7 +85,7 @@ public void onMessage(WebSocket conn, String message) {
         Gson gson = builder.create();
         UserEvent U = gson.fromJson(message, UserEvent.class);
         System.out.println(U.UserId + " sent request " + U.request);
-
+        
         if(U.request == 1){
             User userRequest = new User(U.UserId);
             ActiveUsers.add(userRequest);
@@ -83,6 +107,7 @@ public void onMessage(WebSocket conn, String message) {
             String jsonString = gson.toJson(LobbyUsers);
             broadcast(jsonString);
         }
+
 
         /* 
         // Get our Game Object
@@ -116,25 +141,7 @@ public void onStart() {
     }
 
     public static void main(String[] args) {
-        String filename = "words.txt";
-        //Read in file of words
-        ArrayList<String> wordList = new ArrayList<>();
 
-
-        try(BufferedReader br = new BufferedReader(new FileReader(filename)))
-        {
-            String line;
-            while((line = br.readLine()) != null)
-            {
-                wordList.add(line.trim());
-            }
-        }
-        catch (IOException e)
-        {
-            System.err.println("Error reading file:"+ e.getMessage());
-        }
-        Game G = new Game(wordList);
-        /*
         // Set up the http server
         try{
             String envPort = System.getenv("HTTP_PORT");
@@ -167,7 +174,7 @@ public static void main(String[] args) {
         catch (NullPointerException e){ // Checks for environment variable
             e.printStackTrace();
         }
-        */
+
 
 
     }

src/main/java/com/cse3310/Game.java

@@ -5,15 +5,17 @@
 import java.util.Collections;
 
 public class Game {
-    private ArrayList<User> users;
+    //public ArrayList<User> users;
     public int GameId;
     public char[][] grid;
     public ArrayList<String> wordBank;
-    
+
     public Game(ArrayList<String> words)
     {
-
-        grid = generateGrid(words,wordBank);
+        //users = new ArrayList<User>();
+        wordBank = new ArrayList<String>();
+        this.GameId = 0;
+        this.grid = generateGrid(words,wordBank);
     }
 
     public boolean checkVertical(ArrayList<String> selectedLetters,int startX, int startY, int length){
@@ -49,8 +51,7 @@ public char[][] generateGrid(ArrayList<String> words,ArrayList<String> wordbank)
         double density = .67; // density of grid
         int maxLength = 10;
         int areaFactor = 1;
-       //Input words into the array
-        wordBank = new ArrayList<String>();
+        //Input words into the array
         //Take random words from the word list to put inside a word bank
         int index = 0;
         while(((double)validWordsLetters / (length * width)) < density)
@@ -132,13 +133,11 @@ public char[][] generateGrid(ArrayList<String> words,ArrayList<String> wordbank)
                 {
 
                     grid[i][j] = alphabet.charAt(rand.nextInt(alphabet.length()));
-                    System.out.printf(" |");
                 }
-                else
-                {
+
                     System.out.printf("" + grid[i][j] + "|");
 
-                }
+
 
 
             }

src/main/java/com/cse3310/UserEvent.java

@@ -4,5 +4,4 @@ public class UserEvent {
     int request;
     int GameId;
     String UserId;
-    //int Button[][];
 }