fast fast fertig

This commit is contained in:
Apollo 2019-05-29 12:25:44 +02:00
parent be76f829e9
commit c2de03caff
3 changed files with 22 additions and 3 deletions

View File

@ -46,7 +46,8 @@ public class Start
ReceiveAdapter adapter = new ReceiveAdapter(view,model); ReceiveAdapter adapter = new ReceiveAdapter(view,model);
adapter.registerEvents(); adapter.registerEvents();
view.setSize(800,600);
view.setLocationRelativeTo(null);
view.setVisible(true); view.setVisible(true);
} }

View File

@ -23,11 +23,13 @@ public class ConnectController implements ActionListener
{ {
ChatView view; ChatView view;
Transmitter model; Transmitter model;
int modus;
public ConnectController(ChatView view,Transmitter model,int modus) public ConnectController(ChatView view,Transmitter model,int modus)
{ {
this.view = view; this.view = view;
this.model = model; this.model = model;
this.modus = modus;
if(modus==0) if(modus==0)
{ {
Thread chatter = new Thread(model); Thread chatter = new Thread(model);
@ -51,9 +53,16 @@ public class ConnectController implements ActionListener
} }
@Override @Override
public void actionPerformed(ActionEvent arg0) public void actionPerformed(ActionEvent arg0)
{
if(modus == 1)
{ {
model.setIP_ADRESSE(view.getTxtzielIP().getText()); model.setIP_ADRESSE(view.getTxtzielIP().getText());
Thread chatter = new Thread(model); Thread chatter = new Thread(model);
chatter.start(); chatter.start();
} }
else
{
view.getChatanzeige().setText("Server kann sich nicht verbinden");
}
}
} }

View File

@ -27,7 +27,7 @@ public class Transmitter extends Observable implements Runnable
{ {
private static final Logger lg = OhmLogger.getLogger(); private static final Logger lg = OhmLogger.getLogger();
private static final int PORT = 35000; private static final int PORT = 35000;
private String IP_ADRESSE = "127.0.0.1"; private String IP_ADRESSE = "";
int modus; int modus;
private String nachricht; private String nachricht;
@ -56,7 +56,13 @@ public class Transmitter extends Observable implements Runnable
{ {
sSocket = new ServerSocket(PORT); sSocket = new ServerSocket(PORT);
lg.info("Server: Warte auf Verbindung ..."); lg.info("Server: Warte auf Verbindung ...");
nachricht = "Server: Warte auf Verbindung ...";
setChanged();
notifyObservers();
s = sSocket.accept(); // Achtung: blockiert! s = sSocket.accept(); // Achtung: blockiert!
nachricht = "Verbunden mit Client";
setChanged();
notifyObservers();
lg.info("Server: Verbindung akzeptiert"); lg.info("Server: Verbindung akzeptiert");
} }
catch (IOException ex) catch (IOException ex)
@ -66,6 +72,9 @@ public class Transmitter extends Observable implements Runnable
} }
else if (modus == 1) else if (modus == 1)
{ {
nachricht = "Verbinden mit "+ IP_ADRESSE;
setChanged();
notifyObservers();
lg.info("Client: verbinde ..."); lg.info("Client: verbinde ...");
try try
{ {