completed

tanaytoshniwal · Dec 29, 2017 · 041853d · 041853d
1 parent b9935cd
commit 041853d
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 50 deletions.
diff --git a/GUI/build/classes/chat/Client$1.class b/GUI/build/classes/chat/Client$1.class
diff --git a/GUI/build/classes/chat/Client$Receive2.class b/GUI/build/classes/chat/Client$Receive2.class
diff --git a/GUI/build/classes/chat/Client$Send2.class b/GUI/build/classes/chat/Client$Send2.class
diff --git a/GUI/build/classes/chat/Client.class b/GUI/build/classes/chat/Client.class
diff --git a/GUI/build/classes/chat/Server$1.class b/GUI/build/classes/chat/Server$1.class
diff --git a/GUI/build/classes/chat/Server$Receive1.class b/GUI/build/classes/chat/Server$Receive1.class
diff --git a/GUI/build/classes/chat/Server$Send1.class b/GUI/build/classes/chat/Server$Send1.class
diff --git a/GUI/build/classes/chat/Server.class b/GUI/build/classes/chat/Server.class
diff --git a/GUI/src/chat/Client.java b/GUI/src/chat/Client.java
@@ -27,32 +27,14 @@ public class Client extends javax.swing.JFrame {
     static Socket clientSocket=null;
     static Client obj;
     static Receive2 receiver;
-    static Send2 sender;
+    static DataOutputStream dos;
     boolean b=true;
     public Client() {
         super("second");
         initComponents();
     }
-    class Send2 extends Thread{
-		synchronized public void run(){
-			try{
-                            OutputStream os=clientSocket.getOutputStream();
-                            DataOutputStream dos=new DataOutputStream(os);
-                            String str=msg.getText();
-                            if(!str.equals("")){
-                                dos.write(str.getBytes());
-                                dos.write(13);
-                                dos.flush();
-                            }
-        msg.setText("");
-                            dos.close();
-                            }
-
-			catch(Exception e){}
-		}
-	}
 	class Receive2 extends Thread{
-		synchronized public void run(){
+		 public void run(){
 			try{
 				BufferedReader br=null;
 				try{
@@ -138,8 +120,17 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
 
     private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
         // TODO add your handling code here:
-        sender=obj.new Send2();
-	sender.start();
+        try{
+                            String str=msg.getText();
+                            if(!str.equals("")){
+                                dos.write(str.getBytes());
+                                dos.write(13);
+                                dos.flush();
+                            }
+        msg.setText("");
+                            }
+
+			catch(Exception e){}
     }//GEN-LAST:event_jButton1ActionPerformed
 
     /**
@@ -150,6 +141,7 @@ public static void main(String args[]) throws Exception{
 		obj.setVisible(true);
                 clientSocket=new Socket(InetAddress.getLocalHost(),99);
 
+                             dos=new DataOutputStream(clientSocket.getOutputStream());
 		receiver=obj.new Receive2();
                 receiver.start();
     }

diff --git a/GUI/src/chat/Server.java b/GUI/src/chat/Server.java
@@ -30,14 +30,14 @@ public class Server extends javax.swing.JFrame {
     static Socket client=null;
     static Server obj;
     static Receive1 receiver;
-    static Send1 sender;
+    static DataOutputStream dos;
     public Server() {
         super("first");
         initComponents();
     }
     boolean b=true;
     class Receive1 extends Thread{
-		synchronized public void run(){
+		 public void run(){
 			try{
                             BufferedReader br=null;
                             try{
@@ -58,30 +58,6 @@ synchronized public void run(){
 			catch(IOException e){}
 		}
 	}
-	class Send1 extends Thread{
-		synchronized public void run(){
-			try{
-                            OutputStream os=client.getOutputStream();
-                            DataOutputStream dos=new DataOutputStream(os);
-                            /*BufferedReader br=new BufferedReader(new InputStreamReader(System.in));
-                            while(!(str=br.readLine()).equalsIgnoreCase("quit")){
-                            	dos.write(str.getBytes());
-                            	dos.write(13);
-                            	dos.flush();
-                            }*/
-                            String str=msg.getText();
-                            if(!str.equals("")){
-                                dos.write(str.getBytes());
-                                dos.write(13);
-                                dos.flush();
-                            }
-
-        msg.setText("");
-                            dos.close();
-			}
-			catch(Exception e){}
-		}
-	}
     /**
      * This method is called from within the constructor to initialize the form.
      * WARNING: Do NOT modify this code. The content of this method is always
@@ -146,8 +122,23 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
 
     private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
         // TODO add your handling code here:
-        sender=obj.new Send1();
-        sender.start();
+        try{
+                            /*BufferedReader br=new BufferedReader(new InputStreamReader(System.in));
+                            while(!(str=br.readLine()).equalsIgnoreCase("quit")){
+                            	dos.write(str.getBytes());
+                            	dos.write(13);
+                            	dos.flush();
+                            }*/
+                            String str=msg.getText();
+                            if(!str.equals("")){
+                                dos.write(str.getBytes());
+                                dos.write(13);
+                                dos.flush();
+                            }
+
+        msg.setText("");
+			}
+			catch(Exception e){}
     }//GEN-LAST:event_jButton1ActionPerformed
 
     /**
@@ -170,6 +161,7 @@ public static void main(String args[]) throws Exception{
 		client=serverSocket.accept();
 		receiver=obj.new Receive1();
 
+                             dos=new DataOutputStream(client.getOutputStream());
 		receiver.start();
     }