|
@@ -1,11 +1,14 @@
|
|
|
package clientest;
|
|
package clientest;
|
|
|
|
|
|
|
|
-import java.io.DataInputStream;
|
|
|
|
|
-import java.io.DataOutputStream;
|
|
|
|
|
|
|
+import java.awt.Color;
|
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
|
|
|
+import java.io.ObjectInputStream;
|
|
|
|
|
+import java.io.ObjectOutputStream;
|
|
|
import java.net.Socket;
|
|
import java.net.Socket;
|
|
|
import java.net.UnknownHostException;
|
|
import java.net.UnknownHostException;
|
|
|
|
|
|
|
|
|
|
+import server.network.NetworkMessage;
|
|
|
|
|
+
|
|
|
public class Client {
|
|
public class Client {
|
|
|
public Client(){
|
|
public Client(){
|
|
|
try {
|
|
try {
|
|
@@ -13,26 +16,25 @@ public class Client {
|
|
|
Thread test = new Thread(new Runnable() {
|
|
Thread test = new Thread(new Runnable() {
|
|
|
@Override
|
|
@Override
|
|
|
public void run() {
|
|
public void run() {
|
|
|
- DataInputStream input;
|
|
|
|
|
|
|
+ ObjectInputStream input;
|
|
|
try {
|
|
try {
|
|
|
- input = new DataInputStream(client.getInputStream());
|
|
|
|
|
|
|
+ input = new ObjectInputStream(client.getInputStream());
|
|
|
while(true){
|
|
while(true){
|
|
|
try {
|
|
try {
|
|
|
- System.out.println(input.readUTF());
|
|
|
|
|
- } catch (IOException e) {
|
|
|
|
|
|
|
+ System.out.println(((NetworkMessage)input.readObject()).getMessage());
|
|
|
|
|
+ } catch (ClassNotFoundException e) {
|
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
} catch (IOException e) {
|
|
} catch (IOException e) {
|
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
test.start();
|
|
test.start();
|
|
|
while(true){
|
|
while(true){
|
|
|
- DataOutputStream output = new DataOutputStream(client.getOutputStream());
|
|
|
|
|
- output.writeUTF("test123");
|
|
|
|
|
|
|
+ ObjectOutputStream output = new ObjectOutputStream(client.getOutputStream());
|
|
|
|
|
+ output.writeObject(new NetworkMessage("Test", Color.BLUE, "Kenneth"));
|
|
|
try {
|
|
try {
|
|
|
Thread.sleep(1000);
|
|
Thread.sleep(1000);
|
|
|
} catch (InterruptedException e) {
|
|
} catch (InterruptedException e) {
|