...

src/main/java/kr/co/swh/lecture/opensource/project/drawing/ChattingClientOutputThread.java

@@ -1,46 +0,0 @@
-package kr.co.swh.lecture.opensource.project.drawing;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.net.Socket;
-import java.util.Scanner;
-
-/**
- * <pre>
- * kr.co.swh.lecture.network.chat.client 
- * ChattingClientOutputThread.java
- *
- * 설명 :클라이언트 출력 스레드
- * </pre>
- * 
- * @since : 2018. 12. 28.
- * @author : tobby48
- * @version : v1.0
- */
-public class ChattingClientOutputThread extends Thread{
-	private Socket socket;
-	private String nick;
-	
-	public ChattingClientOutputThread(Socket socket, String nick) {
-		this.socket = socket;
-		this.nick = String.format("[%s] ", nick);
-	}
-	
-	public void run() {
-		DataOutputStream dos = null;
-		Scanner scn = null;
-		try {
-			dos = new DataOutputStream(socket.getOutputStream());
-			scn = new Scanner(System.in);
-			String line;
-			while((line = scn.nextLine())!=null) {
-				dos.writeUTF(nick + line);
-			}
-			socket.close();
-		}catch(IOException e) {
-			e.printStackTrace();
-		}finally {
-			try{ dos.close(); scn.close(); }catch(Exception e) {}
-		}
-	}
-}

src/main/java/kr/co/swh/lecture/opensource/project/drawing/LineDraw.java

@@ -2,10 +2,13 @@ package kr.co.swh.lecture.opensource.project.drawing;
 
 
 import java.awt.BasicStroke;
+import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Point;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseMotionAdapter;
@@ -21,19 +24,28 @@ import java.util.List;
 
 import javax.swing.JFrame;
 import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
 public class LineDraw extends JPanel {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	
 	private List<List<Point>> point = new ArrayList<List<Point>>();
 	private List<List<Point>> drawingPoint = new ArrayList<List<Point>>();
-	DataOutputStream dos;
+	private DataOutputStream drawingOutputStream;
+	private DrawingInputThread drawingInputThread;
 	
-	class ChattingClientInputThread extends Thread{
+	class DrawingInputThread extends Thread{
 		private Socket socket;
 
-		public ChattingClientInputThread(Socket socket) {
+		public DrawingInputThread(Socket socket) {
 			this.socket = socket;
 		}
 
@@ -41,28 +53,33 @@ public class LineDraw extends JPanel {
 			DataInputStream dis = null;
 			try {
 				dis = new DataInputStream(socket.getInputStream());
-				String line = dis.readUTF();
-				Gson gson = new Gson();
-				drawingPoint = gson.fromJson(line, new TypeToken<List<List<Point>>>(){}.getType());
-				System.out.println(drawingPoint);
-				repaint();
+				while(true) {
+					String line = dis.readUTF();
+					Gson gson = new Gson();
+					drawingPoint = gson.fromJson(line, new TypeToken<List<List<Point>>>(){}.getType());
+					System.out.println(drawingPoint);
+					repaint();
+				}
 			}catch(IOException e) {
 				e.printStackTrace();
 			}finally{
-				try{ dis.close(); }catch(Exception e) {}
+//				try{ dis.close(); }catch(Exception e) {}
 			}
 		}
 	}
 	
 	public LineDraw(Socket socket) {
-		ChattingClientInputThread thread = new ChattingClientInputThread(socket);
-		thread.start();
+		drawingInputThread = new DrawingInputThread(socket);
+		drawingInputThread.start();
 		try {
-			dos = new DataOutputStream(socket.getOutputStream());
+			drawingOutputStream = new DataOutputStream(socket.getOutputStream());
 		} catch (IOException e1) {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
 		}
+	}
+	
+	public void addListener() {
 		
 		addMouseListener(new MouseAdapter() {
 			public void mousePressed(MouseEvent event) {
@@ -84,14 +101,14 @@ public class LineDraw extends JPanel {
 				Gson gg = new Gson();
 				point.get(point.size()-1).add(event.getPoint());
 //				repaint();
-				
-				
+				System.out.println("mouseDragged " + point.size());
 				try {
-					dos.writeUTF(gg.toJson(point));
+					drawingOutputStream.writeUTF(gg.toJson(point));
 				} catch (IOException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
+				System.out.println("mouseDragged " + point.size() + " write");
 			}
 			
 		});
@@ -100,6 +117,7 @@ public class LineDraw extends JPanel {
 
 	public void paintComponent(Graphics g) {
 		super.paintComponent(g);
+		System.out.println("paintComponent " + drawingPoint.size());
 		Graphics2D g2 = (Graphics2D) g;
 		g2.setColor(new Color(0, 0, 128));
 		g2.setStroke(new BasicStroke(15f,
@@ -114,10 +132,21 @@ public class LineDraw extends JPanel {
 	}
 
 	public static void main(String[] args) throws UnknownHostException, IOException {
-//		Thread.currentThread().getContextClassLoader().getResourceAsStream("db.pro")
 		Socket socket = new Socket("127.0.0.1", 9998);
 		JFrame f = new JFrame();
-		f.add(new LineDraw(socket));
+		LineDraw panel = new LineDraw(socket);
+		panel.addListener();
+//		JTextField userText = new JTextField();
+//		userText.setEditable(false);
+//		userText.addActionListener(new ActionListener(){
+//			public void actionPerformed(ActionEvent e){
+//				userText.setText("");
+//			}
+//		});
+//		f.add(userText, BorderLayout.NORTH);
+//		JTextArea chatWindow=new JTextArea();
+//		f.add(new JScrollPane(chatWindow),BorderLayout.CENTER);
+		f.add(panel);
 		f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 		f.setSize(800, 600);
 		f.setVisible(true);

src/main/java/kr/co/swh/lecture/opensource/project/drawing/ServerThread.java

@@ -41,6 +41,7 @@ public class ServerThread extends Thread{
             while(true){
                 line = dis.readUTF();
                 //	서버로 들어온 메세지는 접속된 모든 클라이언트에게 전송
+                System.out.println(line);
                 server.broadcast(line);
             }
         }catch(IOException e){