added functionality

ViktorTrojan · Jan 13, 2022 · 9008e97 · 9008e97
1 parent b7c2b12
commit 9008e97
Show file tree

Hide file tree

Showing 10 changed files with 71 additions and 278 deletions.
diff --git a/build/built-jar.properties b/build/built-jar.properties
@@ -1,4 +1,4 @@
-#Sun, 03 Oct 2021 22:43:46 +0200
+#Thu, 13 Jan 2022 20:10:24 +0100
 
 
 C\:\\Users\\Anix\\Documents\\Coding\\Java\\Projects\\SocketChatApp=
diff --git a/build/classes/.netbeans_automatic_build b/build/classes/.netbeans_automatic_build
diff --git a/build/classes/.netbeans_update_resources b/build/classes/.netbeans_update_resources
diff --git a/build/classes/socketchatapp/Main.form b/build/classes/socketchatapp/Main.form
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
@@ -6,8 +6,8 @@
             <file>file:/C:/Users/Anix/Documents/Coding/Java/Projects/SocketChatApp/src/socketchatapp/Network.java</file>
             <file>file:/C:/Users/Anix/Documents/Coding/Java/Projects/SocketChatApp/src/socketchatapp/Client.java</file>
             <file>file:/C:/Users/Anix/Documents/Coding/Java/Projects/SocketChatApp/src/socketchatapp/Server.java</file>
-            <file>file:/C:/Users/Anix/Documents/Coding/Java/Projects/SocketChatApp/src/socketchatapp/UserManager.java</file>
             <file>file:/C:/Users/Anix/Documents/Coding/Java/Projects/SocketChatApp/src/socketchatapp/User.java</file>
+            <file>file:/C:/Users/Anix/Documents/Coding/Java/Projects/SocketChatApp/src/socketchatapp/UserManager.java</file>
             <file>file:/C:/Users/Anix/Documents/Coding/Java/Projects/SocketChatApp/src/socketchatapp/Main.java</file>
         </group>
     </open-files>

diff --git a/src/socketchatapp/Client.java b/src/socketchatapp/Client.java
@@ -1,41 +1,50 @@
 package socketchatapp;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
 import java.io.IOException;
-import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.Scanner;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 public class Client extends Network {
 
     public Client(String ip, int port) {
         this.port = port;
         this.ip = ip;
-        run();
+        init();
     }
 
-    public void sendMSG(String msg) {
-        out.println(msg);
-        out.flush();
-    }
-
-    public void receivedMSG(String msg) {
-        Main.instance.addMessage("> " + msg);
-    }
-
-    public void run() {
+    public void init() {
         try {
             initSocket(new Socket(ip, port));
             out.println(Main.instance.getNAME());
             new Thread(() -> {
-                listener();
+                run();
             }).start();
 
         } catch (IOException ex) {
-            Logger.getLogger(Server.class.getName()).log(Level.SEVERE, null, ex);
+            Main.instance.addMessage("[!] Failed to connect to Server!");
+            Main.instance.switchAll(true);
         }
     }
-}
+
+    public void run() {
+        String res;
+        Scanner sc = new Scanner(in);
+        while (sc.hasNextLine()) {
+            res = sc.nextLine();
+            receivedMSG(res);
+        }
+        // end of Thread
+        sc.close();
+        Main.instance.addMessage("Disconnected!");
+        Main.instance.switchAll(true);
+    }
+
+    public void sendMSG(String msg) {
+        out.println(msg);
+        out.flush();
+    }
+
+    public void receivedMSG(String msg) {
+        Main.instance.addMessage("> " + msg);
+    }
+}
diff --git a/src/socketchatapp/Main.java b/src/socketchatapp/Main.java
@@ -152,12 +152,12 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         pack();
     }// </editor-fold>//GEN-END:initComponents
 
-    public void disableAll() {
-        NAME.setEnabled(false);
-        IP.setEnabled(false);
-        PORT.setEnabled(false);
-        JOIN.setEnabled(false);
-        STARTSERVER.setEnabled(false);
+    public void switchAll(boolean flag) {
+        NAME.setEnabled(flag);
+        IP.setEnabled(flag);
+        PORT.setEnabled(flag);
+        JOIN.setEnabled(flag);
+        STARTSERVER.setEnabled(flag);
     }
 
     public void addMessage(String msg) {
@@ -169,12 +169,16 @@ public String getNAME() {
     }
 
     private void JOINActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_JOINActionPerformed
-        disableAll();
+        if(getNAME().isEmpty()){
+            addMessage("[!] Please Enter a Name!");
+            return;
+        }
+        switchAll(false);
         client = new Client(IP.getText(), Integer.parseInt(PORT.getText()));
     }//GEN-LAST:event_JOINActionPerformed
 
     private void STARTSERVERActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_STARTSERVERActionPerformed
-        disableAll();
+        switchAll(false);
         isServer = true;
         server = new Server(Integer.parseInt(PORT.getText()));
         //PLAYERCOUNT.setText("1/10");

diff --git a/src/socketchatapp/Network.java b/src/socketchatapp/Network.java
@@ -32,17 +32,6 @@ public void initStreams() {
         }
     }
 
-    public void listener() {
-        try {
-            String res;
-            while ((res = in.readLine()) != null) {
-                receivedMSG(res);
-            }
-        } catch (IOException ex) {
-            Logger.getLogger(Network.class.getName()).log(Level.SEVERE, null, ex);
-        }
-    }
-
     public void openServerSocket() {
         try {
             serverSocket = new ServerSocket(port);
@@ -74,8 +63,4 @@ public void closeServerSocket() {
             Logger.getLogger(Network.class.getName()).log(Level.SEVERE, null, ex);
         }
     }
-
-    public void receivedMSG(String s) {
-        System.out.println("MSG: " + s);
-    }
-}
+}