wir hängen irgendwo in der IO
This commit is contained in:
parent
e7034fc7a4
commit
ba0f12561b
@ -34,7 +34,7 @@ public class CommandController implements ActionListener{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void registerCommands(){
|
public void registerCommands(){
|
||||||
CommandSend commandSend = new CommandSend(view);
|
CommandSend commandSend = new CommandSend(view.getGvZeichenflaeche());
|
||||||
invoker.addCommand(view.getBtnConnect(), new CommandConnect(view, commandSend));
|
invoker.addCommand(view.getBtnConnect(), new CommandConnect(view, commandSend));
|
||||||
//invoker.addCommand(view.getTfNachricht(), commandSend);
|
//invoker.addCommand(view.getTfNachricht(), commandSend);
|
||||||
}
|
}
|
||||||
|
@ -5,8 +5,6 @@
|
|||||||
|
|
||||||
package ChatProgramm.controller;
|
package ChatProgramm.controller;
|
||||||
|
|
||||||
import ChatProgramm.controller.commands.CommandConnect;
|
|
||||||
import ChatProgramm.controller.commands.CommandInvoker;
|
|
||||||
import ChatProgramm.controller.commands.CommandSend;
|
import ChatProgramm.controller.commands.CommandSend;
|
||||||
import java.awt.Point;
|
import java.awt.Point;
|
||||||
import java.awt.event.MouseAdapter;
|
import java.awt.event.MouseAdapter;
|
||||||
@ -14,7 +12,6 @@ import java.awt.event.MouseEvent;
|
|||||||
import java.awt.event.MouseMotionListener;
|
import java.awt.event.MouseMotionListener;
|
||||||
import ChatProgramm.model.GrafikModel;
|
import ChatProgramm.model.GrafikModel;
|
||||||
import ChatProgramm.view.GrafikView;
|
import ChatProgramm.view.GrafikView;
|
||||||
import java.awt.Component;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
@ -24,12 +21,13 @@ public class GrafikController extends MouseAdapter implements MouseMotionListene
|
|||||||
{
|
{
|
||||||
private GrafikView view;
|
private GrafikView view;
|
||||||
private GrafikModel model;
|
private GrafikModel model;
|
||||||
private CommandInvoker invoker;
|
private CommandSend commandSend;
|
||||||
|
|
||||||
public GrafikController(GrafikView view, GrafikModel model)
|
public GrafikController(GrafikView view, GrafikModel model)
|
||||||
{
|
{
|
||||||
this.view = view;
|
this.view = view;
|
||||||
this.model = model;
|
this.model = model;
|
||||||
|
commandSend = new CommandSend(view);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void registerEvents()
|
public void registerEvents()
|
||||||
@ -37,10 +35,7 @@ public class GrafikController extends MouseAdapter implements MouseMotionListene
|
|||||||
view.addMouseMotionListener(this);
|
view.addMouseMotionListener(this);
|
||||||
view.addMouseListener(this);
|
view.addMouseListener(this);
|
||||||
}
|
}
|
||||||
public void registerCommands(){
|
|
||||||
CommandSend commandSend = new CommandSend(view);
|
|
||||||
invoker.addCommand(view.getTNachricht(), commandSend);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -60,8 +55,7 @@ public class GrafikController extends MouseAdapter implements MouseMotionListene
|
|||||||
public void mouseReleased(MouseEvent evt)
|
public void mouseReleased(MouseEvent evt)
|
||||||
{
|
{
|
||||||
model.endShape();
|
model.endShape();
|
||||||
Component key = (Component)evt.getSource();
|
commandSend.execute();
|
||||||
invoker.executeCommand(key);
|
|
||||||
// if (evt.getButton() == MouseEvent.BUTTON3)
|
// if (evt.getButton() == MouseEvent.BUTTON3)
|
||||||
// {
|
// {
|
||||||
// view.doPrint();
|
// view.doPrint();
|
||||||
|
@ -43,6 +43,7 @@ public class CommandSend implements CommandInterface
|
|||||||
@Override
|
@Override
|
||||||
public void execute()
|
public void execute()
|
||||||
{
|
{
|
||||||
|
lg.info("wir sind drin");
|
||||||
//ToDo in dieser methode muss die Figur serialisiert werden und zum
|
//ToDo in dieser methode muss die Figur serialisiert werden und zum
|
||||||
//übermitteln bereitgestellt werden
|
//übermitteln bereitgestellt werden
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@ import java.util.concurrent.Flow.Subscriber;
|
|||||||
*
|
*
|
||||||
* @author ahren
|
* @author ahren
|
||||||
*/
|
*/
|
||||||
public class ReceiveAdapter implements Subscriber<Nachricht> {
|
public class ReceiveAdapter implements Subscriber<Figur> {
|
||||||
|
|
||||||
private ChatView view;
|
private ChatView view;
|
||||||
private Flow.Subscription subscription;
|
private Flow.Subscription subscription;
|
||||||
@ -27,7 +27,6 @@ public class ReceiveAdapter implements Subscriber<Nachricht> {
|
|||||||
this.subscription.request(1);
|
this.subscription.request(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onNext(Nachricht item) {
|
public void onNext(Nachricht item) {
|
||||||
|
|
||||||
//ToDo: hier muss der gFrame aufgerufen werden
|
//ToDo: hier muss der gFrame aufgerufen werden
|
||||||
@ -43,4 +42,9 @@ public class ReceiveAdapter implements Subscriber<Nachricht> {
|
|||||||
@Override
|
@Override
|
||||||
public void onComplete(){
|
public void onComplete(){
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onNext(Figur item)
|
||||||
|
{
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -5,10 +5,14 @@
|
|||||||
package ChatProgramm.model;
|
package ChatProgramm.model;
|
||||||
|
|
||||||
import ChatProgramm.view.ChatView;
|
import ChatProgramm.view.ChatView;
|
||||||
|
import java.io.BufferedInputStream;
|
||||||
|
import java.io.BufferedOutputStream;
|
||||||
import java.io.BufferedReader;
|
import java.io.BufferedReader;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.io.InputStreamReader;
|
import java.io.InputStreamReader;
|
||||||
|
import java.io.ObjectInputStream;
|
||||||
|
import java.io.ObjectOutputStream;
|
||||||
import java.io.OutputStream;
|
import java.io.OutputStream;
|
||||||
import java.io.OutputStreamWriter;
|
import java.io.OutputStreamWriter;
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
@ -34,13 +38,13 @@ public abstract class Transmitter implements Runnable, Subscriber<String>, Trans
|
|||||||
private static Logger lg = Logger.getLogger("netz");
|
private static Logger lg = Logger.getLogger("netz");
|
||||||
|
|
||||||
protected Socket socket;
|
protected Socket socket;
|
||||||
protected BufferedReader reader;
|
protected ObjectInputStream reader;
|
||||||
protected PrintWriter writer;
|
protected ObjectOutputStream writer;
|
||||||
|
|
||||||
private Nachricht nachricht;
|
private Figur figur;
|
||||||
private String txtNachricht;
|
private String txtNachricht;
|
||||||
private boolean laufend;
|
private boolean laufend;
|
||||||
private SubmissionPublisher<Nachricht> textPublisher;
|
private SubmissionPublisher<Figur> figurPublisher;
|
||||||
private ExecutorService eService;
|
private ExecutorService eService;
|
||||||
private String receivedString;
|
private String receivedString;
|
||||||
private ChatView view;
|
private ChatView view;
|
||||||
@ -51,15 +55,15 @@ public abstract class Transmitter implements Runnable, Subscriber<String>, Trans
|
|||||||
socket = new Socket();
|
socket = new Socket();
|
||||||
eService = null;
|
eService = null;
|
||||||
receiveAdapter = new ReceiveAdapter(view);
|
receiveAdapter = new ReceiveAdapter(view);
|
||||||
textPublisher = new SubmissionPublisher<>();
|
figurPublisher = new SubmissionPublisher<>();
|
||||||
this.view = view;
|
this.view = view;
|
||||||
addWertSubscription(receiveAdapter);
|
addWertSubscription(receiveAdapter);
|
||||||
nachricht = new Nachricht("");
|
figur = new Figur();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addWertSubscription(Subscriber<Nachricht> subscriber)
|
public void addWertSubscription(Subscriber<Figur> subscriber)
|
||||||
{
|
{
|
||||||
textPublisher.subscribe(subscriber);
|
figurPublisher.subscribe(subscriber);
|
||||||
}
|
}
|
||||||
|
|
||||||
public abstract void connect() throws IOException;
|
public abstract void connect() throws IOException;
|
||||||
@ -69,12 +73,17 @@ public abstract class Transmitter implements Runnable, Subscriber<String>, Trans
|
|||||||
lg.info("Initialisiere reader und writer");
|
lg.info("Initialisiere reader und writer");
|
||||||
InputStream is = socket.getInputStream();
|
InputStream is = socket.getInputStream();
|
||||||
OutputStream os = socket.getOutputStream();
|
OutputStream os = socket.getOutputStream();
|
||||||
|
|
||||||
|
lg.info("1");
|
||||||
|
BufferedOutputStream bos = new BufferedOutputStream(os);
|
||||||
|
|
||||||
|
BufferedInputStream bis = new BufferedInputStream(is);
|
||||||
|
lg.info("2");
|
||||||
|
// InputStreamReader isr = new InputStreamReader(is, "UTF-8");
|
||||||
|
// OutputStreamWriter osr = new OutputStreamWriter(os, "UTF-8");
|
||||||
|
|
||||||
InputStreamReader isr = new InputStreamReader(is, "UTF-8");
|
reader = new ObjectInputStream(bis);
|
||||||
OutputStreamWriter osr = new OutputStreamWriter(os, "UTF-8");
|
writer = new ObjectOutputStream(bos);
|
||||||
|
|
||||||
reader = new BufferedReader(isr);
|
|
||||||
writer = new PrintWriter(osr);
|
|
||||||
lg.info("Reader / Writer Initialisierung abgeschlossen");
|
lg.info("Reader / Writer Initialisierung abgeschlossen");
|
||||||
startempfangen();
|
startempfangen();
|
||||||
lg.info("Warte auf Nachricht");
|
lg.info("Warte auf Nachricht");
|
||||||
@ -86,27 +95,42 @@ public abstract class Transmitter implements Runnable, Subscriber<String>, Trans
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void send(String txtNachricht){
|
/**
|
||||||
|
*
|
||||||
writer.println(txtNachricht);
|
* @param figur
|
||||||
|
* @throws IOException
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void send(Figur figur){
|
||||||
|
try
|
||||||
|
{
|
||||||
|
writer.writeObject(figur);
|
||||||
writer.flush();
|
writer.flush();
|
||||||
|
}
|
||||||
|
catch (IOException ex)
|
||||||
|
{
|
||||||
|
Logger.getLogger(Transmitter.class.getName()).log(Level.SEVERE, null, ex);
|
||||||
|
}
|
||||||
lg.info("Nachricht gesendet");
|
lg.info("Nachricht gesendet");
|
||||||
nachricht.setNachricht("\nDu: " + txtNachricht);
|
figurPublisher.submit(figur);
|
||||||
textPublisher.submit(nachricht);
|
|
||||||
}
|
}
|
||||||
public Nachricht receive(){
|
public Figur receive(){
|
||||||
try {
|
try {
|
||||||
txtNachricht = reader.readLine();
|
figur = (Figur) reader.readObject();
|
||||||
if(!txtNachricht.isEmpty()){
|
if(!txtNachricht.isEmpty()){
|
||||||
lg.info("Nachricht erhalten");
|
lg.info("Nachricht erhalten");
|
||||||
nachricht.setNachricht("\nEr / Sie: " + txtNachricht);
|
|
||||||
return nachricht;
|
return figur;
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
return nachricht;
|
catch (ClassNotFoundException ex)
|
||||||
|
{
|
||||||
|
Logger.getLogger(Transmitter.class.getName()).log(Level.SEVERE, null, ex);
|
||||||
|
}
|
||||||
|
return figur;
|
||||||
}
|
}
|
||||||
|
|
||||||
// public void disconnect (){
|
// public void disconnect (){
|
||||||
@ -120,9 +144,9 @@ public abstract class Transmitter implements Runnable, Subscriber<String>, Trans
|
|||||||
while (true) {
|
while (true) {
|
||||||
lg.info("Warte auf Nachricht");
|
lg.info("Warte auf Nachricht");
|
||||||
if(laufend) {
|
if(laufend) {
|
||||||
nachricht = receive();
|
figur = receive();
|
||||||
if(!nachricht.getNachricht().isEmpty()){
|
if(!figur.getPunkte().isEmpty()){
|
||||||
textPublisher.submit(nachricht);
|
figurPublisher.submit(figur);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
|
@ -11,7 +11,7 @@ import ChatProgramm.model.Nachricht;
|
|||||||
*/
|
*/
|
||||||
public interface TransmitterInterface
|
public interface TransmitterInterface
|
||||||
{
|
{
|
||||||
public void send(String txtNachricht);
|
public void send(Figur figur);
|
||||||
public Nachricht receive();
|
public Figur receive();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user