|
@@ -2,18 +2,14 @@ package kr.co.swh.lecture.opensource.project.drawing;
|
2
|
2
|
|
3
|
3
|
|
4
|
4
|
import java.awt.BasicStroke;
|
5
|
|
-import java.awt.BorderLayout;
|
6
|
5
|
import java.awt.Color;
|
7
|
6
|
import java.awt.Graphics;
|
8
|
7
|
import java.awt.Graphics2D;
|
9
|
8
|
import java.awt.Point;
|
10
|
|
-import java.awt.event.ActionEvent;
|
11
|
|
-import java.awt.event.ActionListener;
|
12
|
9
|
import java.awt.event.MouseAdapter;
|
13
|
10
|
import java.awt.event.MouseEvent;
|
14
|
11
|
import java.awt.event.MouseMotionAdapter;
|
15
|
12
|
import java.awt.geom.Line2D;
|
16
|
|
-import java.io.BufferedWriter;
|
17
|
13
|
import java.io.DataInputStream;
|
18
|
14
|
import java.io.DataOutputStream;
|
19
|
15
|
import java.io.IOException;
|
|
@@ -24,9 +20,6 @@ import java.util.List;
|
24
|
20
|
|
25
|
21
|
import javax.swing.JFrame;
|
26
|
22
|
import javax.swing.JPanel;
|
27
|
|
-import javax.swing.JScrollPane;
|
28
|
|
-import javax.swing.JTextArea;
|
29
|
|
-import javax.swing.JTextField;
|
30
|
23
|
|
31
|
24
|
import com.google.gson.Gson;
|
32
|
25
|
import com.google.gson.reflect.TypeToken;
|
|
@@ -41,6 +34,7 @@ public class LineDraw extends JPanel {
|
41
|
34
|
private List<List<Point>> drawingPoint = new ArrayList<List<Point>>();
|
42
|
35
|
private DataOutputStream drawingOutputStream;
|
43
|
36
|
private DrawingInputThread drawingInputThread;
|
|
37
|
+ private Gson gson = new Gson();;
|
44
|
38
|
|
45
|
39
|
class DrawingInputThread extends Thread{
|
46
|
40
|
private Socket socket;
|
|
@@ -55,7 +49,6 @@ public class LineDraw extends JPanel {
|
55
|
49
|
dis = new DataInputStream(socket.getInputStream());
|
56
|
50
|
while(true) {
|
57
|
51
|
String line = dis.readUTF();
|
58
|
|
- Gson gson = new Gson();
|
59
|
52
|
drawingPoint = gson.fromJson(line, new TypeToken<List<List<Point>>>(){}.getType());
|
60
|
53
|
System.out.println(drawingPoint);
|
61
|
54
|
repaint();
|
|
@@ -97,13 +90,12 @@ public class LineDraw extends JPanel {
|
97
|
90
|
|
98
|
91
|
addMouseMotionListener(new MouseMotionAdapter() {
|
99
|
92
|
public void mouseDragged(MouseEvent event) {
|
100
|
|
- Point p = event.getPoint();
|
101
|
|
- Gson gg = new Gson();
|
|
93
|
+
|
102
|
94
|
point.get(point.size()-1).add(event.getPoint());
|
103
|
95
|
// repaint();
|
104
|
96
|
System.out.println("mouseDragged " + point.size());
|
105
|
97
|
try {
|
106
|
|
- drawingOutputStream.writeUTF(gg.toJson(point));
|
|
98
|
+ drawingOutputStream.writeUTF(gson.toJson(point));
|
107
|
99
|
} catch (IOException e) {
|
108
|
100
|
// TODO Auto-generated catch block
|
109
|
101
|
e.printStackTrace();
|