remote group fixed

remote group chating problem fixed
rafiulgits · Nov 12, 2018 · 3a49b18 · 3a49b18
1 parent 1cd9655
commit 3a49b18
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 18 deletions.
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
@@ -3,11 +3,7 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/D:/Programming/My%20Program%20Code/Java%20Language/IP-Messenger/src/panel/FileSender.java</file>
             <file>file:/D:/Programming/My%20Program%20Code/Java%20Language/IP-Messenger/src/panel/ChatPanel.java</file>
-            <file>file:/D:/Programming/My%20Program%20Code/Java%20Language/IP-Messenger/src/panel/FileProgress.java</file>
-            <file>file:/D:/Programming/My%20Program%20Code/Java%20Language/IP-Messenger/src/panel/FileFinishListener.java</file>
-            <file>file:/D:/Programming/My%20Program%20Code/Java%20Language/IP-Messenger/src/panel/FileReceiver.java</file>
         </group>
     </open-files>
 </project-private>
diff --git a/src/driver/Opening.java b/src/driver/Opening.java
@@ -465,10 +465,13 @@ else if(opServer.isSelected()){
 
                         ServerSocket ss = new ServerSocket(port);
 
-
+                        list = new ArrayList<>(); // socket list initialize
+                        Socket fc = ss.accept();
+                        list.add(fc);
+                        new MultiClientHandle(fc,list.size()-1);
                         /**
-                         * When user create a new chat box, user is the first client of this chat
-                         * box. 
+                         * When user create a new chat box, user is the second client of this chat
+                         * box. This thread will be executed after first client added.
                          * So here a socket will created for the server created user.
                          */
                         new Thread(new Runnable(){
@@ -478,18 +481,14 @@ public void run(){
                                      * As this is a thread so it must created after server socket
                                      * is bound. So 200 millisecond is for server socket bound.
                                      */
-                                    Thread.sleep(200);
                                     Socket socket = new Socket(InetAddress.getLocalHost(),port);
                                     new ChatPanel(frame, socket, name, true);
                                 } catch(IOException ex){
                                     JOptionPane.showMessageDialog(null, ex);
-                                } catch(InterruptedException ex){
-                                    JOptionPane.showMessageDialog(null, ex);
-                                }
+                                } 
                             }
                         }).start();
 
-                        list = new ArrayList<>(); // socket list initialize
                         new Thread(new Runnable(){
                             private boolean serverRunning = true;
                             public void run(){

diff --git a/src/panel/ChatPanel.java b/src/panel/ChatPanel.java
@@ -155,7 +155,6 @@ public void onFileFinish(int state) {
                              * file transfer.
                              */
                             dis.readBoolean();
-                            System.out.println("Confirmation to receive");
                             receiver.start();
                             /**
                              * unable to access file UI components when an operation 
@@ -268,17 +267,21 @@ public void actionPerformed(ActionEvent e) {
                      * Next sent the host address and port
                      * Next sent the file name and file size
                      */ 
+
+                    // port to connect
+                    int port = 49600;
+
                     dos.writeUTF("1");
 
                     // send the host and port
                     dos.writeUTF(socket.getInetAddress().getHostAddress());
-                    dos.writeInt(socket.getPort()-10);
+                    dos.writeInt(port);
 
                     // send the file name and file length
                     dos.writeUTF(file.getAbsoluteFile().getName());
                     dos.writeLong(file.getAbsoluteFile().length());
 
-                    FileSender fileSender = new FileSender(socket.getPort()-10) {
+                    FileSender fileSender = new FileSender(port) {
                         @Override
                         public void onFileProgress(int progress){
                             bar.setValue(progress);

diff --git a/src/panel/FileReceiver.java b/src/panel/FileReceiver.java
@@ -22,7 +22,6 @@
 import java.net.Socket;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.swing.JOptionPane;
 import javax.swing.JProgressBar;
 import javax.swing.filechooser.FileSystemView;
 

diff --git a/src/panel/FileSender.java b/src/panel/FileSender.java
@@ -23,8 +23,6 @@
 import java.net.Socket;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.swing.JButton;
-import javax.swing.JOptionPane;
 import javax.swing.JProgressBar;
 
 /**