Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 0317fcf

Browse files
Fully Refactoured to finish whole the application..
1 parent 3f18339 commit 0317fcf

File tree

14 files changed

+374
-38
lines changed

14 files changed

+374
-38
lines changed

‎.idea/uiDesigner.xml

Lines changed: 124 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Client_Side/src/Client02.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
*/
1414

1515
public class Client02 extends Application {
16+
public static void main(String[] args) {
17+
launch(args);
18+
}
19+
1620
@Override
1721
public void start(Stage primaryStage) throws Exception {
18-
Parent root = FXMLLoader.load(getClass().getResource("View/sample.fxml"));
22+
Parent root = FXMLLoader.load(getClass().getResource("View/Login_Signup.fxml"));
1923
primaryStage.setTitle("Messenger!");
2024
primaryStage.setScene(new Scene(root, 330, 560));
2125
primaryStage.setResizable(false);
2226
primaryStage.show();
2327
}
24-
25-
public static void main(String[] args) {
26-
launch(args);
27-
}
2828
}

‎Client_Side/src/Client03.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
*/
1414

1515
public class Client03 extends Application {
16+
public static void main(String[] args) {
17+
launch(args);
18+
}
19+
1620
@Override
1721
public void start(Stage primaryStage) throws Exception {
18-
Parent root = FXMLLoader.load(getClass().getResource("View/sample.fxml"));
22+
Parent root = FXMLLoader.load(getClass().getResource("View/Login_Signup.fxml"));
1923
primaryStage.setTitle("Messenger!");
2024
primaryStage.setScene(new Scene(root, 330, 560));
2125
primaryStage.setResizable(false);
2226
primaryStage.show();
2327
}
24-
25-
public static void main(String[] args) {
26-
launch(args);
27-
}
2828
}

‎Client_Side/src/Controller/Client_Room.java

Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import java.util.ResourceBundle;
3939

4040
import static Controller.Login_Signup.users;
41+
4142
public class Client_Room extends Thread implements Initializable {
4243
public Label clientName;
4344
public Button profileBtn;
@@ -68,14 +69,16 @@ public class Client_Room extends Thread implements Initializable {
6869

6970
public boolean toggleChat = false, toggleProfile = false;
7071

71-
/** Changing profile pic */
72+
/**
73+
* Changing profile pic
74+
*/
7275

7376
public boolean saveControl = false;
7477

7578
BufferedReader reader;
7679
PrintWriter writer;
7780
Socket socket;
78-
81+
Stringmsg = "";
7982
private FileChooser fileChooser;
8083
private File filePath;
8184

@@ -108,7 +111,7 @@ public void initialize(URL location, ResourceBundle resources) {
108111
l.setVisible(false);
109112
}
110113

111-
public void connectSocket(){
114+
public void connectSocket(){
112115
try {
113116
socket = new Socket("localhost", 5006);
114117
System.out.println("Socket is connected with server!");
@@ -120,6 +123,7 @@ public void connectSocket(){
120123
e.printStackTrace();
121124
}
122125
}
126+
123127
@Override
124128
public void run() {
125129
try {
@@ -181,19 +185,18 @@ public void setProfile() {
181185

182186
public void handleSendEvent(MouseEvent mouseEvent) {
183187
send();
184-
for(User user : users) {
188+
for(User user : users) {
185189
System.out.println(user.name);
186190
}
187191
}
188192

189-
String msg="";
190193
public void send() {
191194
msg = msgField.getText();
192195
writer.println(Login_Signup.username + ": " + msg);
193196
msgRoom.setNodeOrientation(NodeOrientation.LEFT_TO_RIGHT);
194197
msgRoom.appendText("Me: " + msg + "\n");
195198
msgField.setText("");
196-
if(msg.equalsIgnoreCase("BYE") || (msg.equalsIgnoreCase("logout"))) {
199+
if(msg.equalsIgnoreCase("BYE") || (msg.equalsIgnoreCase("logout"))) {
197200
System.exit(0);
198201
}
199202
}
@@ -262,40 +265,51 @@ public void cameraIconMouseClicked(MouseEvent mouseEvent) {
262265
}
263266

264267
public void clickEmoji1(MouseEvent mouseEvent) {
265-
msgField.setText(msg+a.getText());
268+
msgField.setText(msg + a.getText());
266269
}
270+
267271
public void clickEmoji2(MouseEvent mouseEvent) {
268-
msgField.setText(msg+b.getText());
272+
msgField.setText(msg + b.getText());
269273
}
274+
270275
public void clickEmoji3(MouseEvent mouseEvent) {
271-
msgField.setText(msg+c.getText());
276+
msgField.setText(msg + c.getText());
272277
}
278+
273279
public void clickEmoji4(MouseEvent mouseEvent) {
274-
msgField.setText(msg+d.getText());
280+
msgField.setText(msg + d.getText());
275281
}
282+
276283
public void clickEmoji5(MouseEvent mouseEvent) {
277-
msgField.setText(msg+e.getText());
284+
msgField.setText(msg + e.getText());
278285
}
286+
279287
public void clickEmoji6(MouseEvent mouseEvent) {
280-
msgField.setText(msg+f.getText());
288+
msgField.setText(msg + f.getText());
281289
}
290+
282291
public void clickEmoji7(MouseEvent mouseEvent) {
283-
msgField.setText(msg+g.getText());
292+
msgField.setText(msg + g.getText());
284293
}
294+
285295
public void clickEmoji8(MouseEvent mouseEvent) {
286-
msgField.setText(msg+h.getText());
296+
msgField.setText(msg + h.getText());
287297
}
298+
288299
public void clickEmoji9(MouseEvent mouseEvent) {
289-
msgField.setText(msg+i.getText());
300+
msgField.setText(msg + i.getText());
290301
}
302+
291303
public void clickEmoji10(MouseEvent mouseEvent) {
292-
msgField.setText(msg+j.getText());
304+
msgField.setText(msg + j.getText());
293305
}
306+
294307
public void clickEmoji11(MouseEvent mouseEvent) {
295-
msgField.setText(msg+k.getText());
308+
msgField.setText(msg + k.getText());
296309
}
310+
297311
public void clickEmoji12(MouseEvent mouseEvent) {
298-
msgField.setText(msg+l.getText());
312+
msgField.setText(msg + l.getText());
299313
}
300314

301315
}

‎Client_Side/src/Controller/Login_Signup.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public void registration(ActionEvent event) {
9696
}
9797

9898
private void setOpacity(Label a, Label b, Label c, Label d) {
99-
if(a.getOpacity() == 1 || b.getOpacity() == 1 || c.getOpacity() == 1 || d.getOpacity() == 1) {
99+
if(a.getOpacity() == 1 || b.getOpacity() == 1 || c.getOpacity() == 1 || d.getOpacity() == 1) {
100100
a.setOpacity(0);
101101
b.setOpacity(0);
102102
c.setOpacity(0);

‎Server_Side/src/ClientHandler.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class ClientHandler extends Thread {
2121
private PrintWriter writer;
2222

2323

24-
public ClientHandler(Socket socket, ArrayList<ClientHandler> clients){
24+
public ClientHandler(Socket socket, ArrayList<ClientHandler> clients){
2525
try {
2626
this.socket = socket;
2727
this.clients = clients;
@@ -31,12 +31,13 @@ public ClientHandler (Socket socket, ArrayList<ClientHandler> clients){
3131
e.printStackTrace();
3232
}
3333
}
34-
public void run(){
34+
35+
public void run() {
3536

3637
try {
3738
String massage;
3839
while ((massage = reader.readLine()) != null) {
39-
if(massage.equalsIgnoreCase("exit")){
40+
if(massage.equalsIgnoreCase("exit")){
4041
break;
4142
}
4243
for (ClientHandler client : clients) {
@@ -45,13 +46,12 @@ public void run(){
4546
}
4647
} catch (IOException e) {
4748
e.printStackTrace();
48-
}
49-
finally {
49+
} finally {
5050
try {
5151
reader.close();
5252
writer.close();
5353
socket.close();
54-
}catch (IOException e){
54+
}catch (IOException e){
5555
e.printStackTrace();
5656
}
5757
}

‎Server_Side/src/Server.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,17 @@
1212
*/
1313

1414
public class Server {
15-
/** Create static ArrayList with handle for clients*/
16-
private static ArrayList<ClientHandler> clients = new ArrayList<ClientHandler>();
15+
/**
16+
* Create static ArrayList with handle for clients
17+
*/
18+
private static final ArrayList<ClientHandler> clients = new ArrayList<ClientHandler>();
1719

1820
public static void main(String[] args) {
1921
ServerSocket serverSocket;
2022
Socket socket;
2123
try {
2224
serverSocket = new ServerSocket(5006);
23-
while(true) {
25+
while(true) {
2426
System.out.println("Waiting for clients...");
2527
socket = serverSocket.accept();
2628
System.out.println("Connected Successfully...");
1.22 KB
Binary file not shown.
1.22 KB
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /