From 90fd825bfe8346cf9b4987baf96d58ca71b35148 Mon Sep 17 00:00:00 2001
From: Mehrdad Shirvani <mehrdadsh0901@gmail.com>
Date: Tue, 13 May 2025 13:30:43 +0330
Subject: [PATCH] refactor: change some names

---
 .../java/Client/{BattleShipClient.java => Client.java}    | 6 +++---
 ...ientNetworkHandler.java => ClientNetworkReceiver.java} | 7 +++----
 src/main/java/Server/ClientHandler.java                   | 3 ---
 .../java/Server/{BattleShipServer.java => Server.java}    | 8 +-------
 4 files changed, 7 insertions(+), 17 deletions(-)
 rename src/main/java/Client/{BattleShipClient.java => Client.java} (98%)
 rename src/main/java/Client/{BattleShipClientNetworkHandler.java => ClientNetworkReceiver.java} (82%)
 rename src/main/java/Server/{BattleShipServer.java => Server.java} (96%)

diff --git a/src/main/java/Client/BattleShipClient.java b/src/main/java/Client/Client.java
similarity index 98%
rename from src/main/java/Client/BattleShipClient.java
rename to src/main/java/Client/Client.java
index cebd72c..c3db180 100644
--- a/src/main/java/Client/BattleShipClient.java
+++ b/src/main/java/Client/Client.java
@@ -7,7 +7,7 @@ import java.net.URL;
 import java.util.*;
 import Client.utils.AnsiColor;
 
-public class BattleShipClient {
+public class Client {
     private static final String SPACING = "     ";
     private static final String IP_ADDRESS = "127.0.0.1";
     private static final int PORT_NUMBER = 3737;
@@ -27,7 +27,7 @@ public class BattleShipClient {
     volatile boolean otherPlayerJoined = false;
     DataOutputStream out;
 
-    public BattleShipClient(Socket clientSocket) {
+    public Client(Socket clientSocket) {
         this.clientSocket = clientSocket;
 
         try {
@@ -139,7 +139,7 @@ public class BattleShipClient {
     private static void playSound(String soundFileName) {
         try {
             // Load the sound file from the resources folder
-            URL soundFileURL = BattleShipClient.class.getClassLoader().getResource( soundFileName);
+            URL soundFileURL = Client.class.getClassLoader().getResource( soundFileName);
 
             if (soundFileURL == null) {
                 System.out.println("Sound file not found: " + soundFileName);
diff --git a/src/main/java/Client/BattleShipClientNetworkHandler.java b/src/main/java/Client/ClientNetworkReceiver.java
similarity index 82%
rename from src/main/java/Client/BattleShipClientNetworkHandler.java
rename to src/main/java/Client/ClientNetworkReceiver.java
index 37dc6c3..c073649 100644
--- a/src/main/java/Client/BattleShipClientNetworkHandler.java
+++ b/src/main/java/Client/ClientNetworkReceiver.java
@@ -3,13 +3,12 @@ package Client;
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.net.Socket;
-import java.util.Objects;
 
-public class BattleShipClientNetworkHandler implements Runnable{
-    private BattleShipClient client;
+public class ClientNetworkReceiver implements Runnable{
+    private Client client;
     private DataInputStream in;
 
-    public BattleShipClientNetworkHandler(Socket clientSocket, BattleShipClient client) throws IOException {
+    public ClientNetworkReceiver(Socket clientSocket, Client client) throws IOException {
         // initialize client
         // initialize in
     }
diff --git a/src/main/java/Server/ClientHandler.java b/src/main/java/Server/ClientHandler.java
index c22b8da..cdf6790 100644
--- a/src/main/java/Server/ClientHandler.java
+++ b/src/main/java/Server/ClientHandler.java
@@ -37,7 +37,6 @@ public class ClientHandler implements Runnable {
             while(true) {
                 // TODO: Read a UTF-encoded string from the client
                 String request = "";
-
                 if (false) { //TODO: Set Username
                     int playerNumber = isFirst?0:1;
                     // TODO: Send player number to client
@@ -47,10 +46,8 @@ public class ClientHandler implements Runnable {
                     //TODO: tell the clients that the other player joined
                 }
                 else if (false) { //TODO: Handle Attack
-
                     int row = 0;//TODO: extract row and col
                     int col = 0;//TODO: extract row and col
-
                     //TODO: inform enemy of the attack
                 }
                 else if (false) { //TODO: Handle Hit Result
diff --git a/src/main/java/Server/BattleShipServer.java b/src/main/java/Server/Server.java
similarity index 96%
rename from src/main/java/Server/BattleShipServer.java
rename to src/main/java/Server/Server.java
index 4e990af..1e8b062 100644
--- a/src/main/java/Server/BattleShipServer.java
+++ b/src/main/java/Server/Server.java
@@ -2,12 +2,11 @@ package Server;
 
 import java.io.IOException;
 import java.net.ServerSocket;
-import java.net.Socket;
 import java.util.ArrayList;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-public class BattleShipServer {
+public class Server {
     private static int PORT = 3737;
     // TODO: Create a collection to keep track of connected clients
     private static ArrayList<ClientHandler> clients = new ArrayList();
@@ -23,13 +22,10 @@ public class BattleShipServer {
         try {
             // TODO: Create a ServerSocket to listen for incoming connections
             //int i = 0;
-
             while(true) {
 
                 // TODO: Accept a client connection
-
                 // TODO: Create a ClientHandler for the connected client
-
                 //TODO: uncomment this code
                 //if(i == 0) {
                 //    playerOne = clientThread;
@@ -40,9 +36,7 @@ public class BattleShipServer {
                 //    playerTwo.setEnemy(playerOne);
                 //}
                 //i++;
-
                 //TODO add clientThread to clients and executor service
-
             }
         } finally {
             if (listener != null) {