From c2de03caff94819639bfc4a440ebccb7a3c8dc6f Mon Sep 17 00:00:00 2001
From: Apollo <Apollo@roam215074.roam.fh-nuernberg.de>
Date: Wed, 29 May 2019 12:25:44 +0200
Subject: [PATCH] fast fast fertig

---
 src/chatprogramm/Start.java           |  3 ++-
 src/controller/ConnectController.java |  9 +++++++++
 src/model/Transmitter.java            | 13 +++++++++++--
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/chatprogramm/Start.java b/src/chatprogramm/Start.java
index 525b7d7..a8ceee0 100644
--- a/src/chatprogramm/Start.java
+++ b/src/chatprogramm/Start.java
@@ -46,7 +46,8 @@ public class Start
     
     ReceiveAdapter adapter = new ReceiveAdapter(view,model);
     adapter.registerEvents();
-    
+    view.setSize(800,600);
+    view.setLocationRelativeTo(null);
     view.setVisible(true);
        
   }
diff --git a/src/controller/ConnectController.java b/src/controller/ConnectController.java
index e535dcd..dece3ef 100644
--- a/src/controller/ConnectController.java
+++ b/src/controller/ConnectController.java
@@ -23,11 +23,13 @@ public class ConnectController implements ActionListener
 {
   ChatView view;
   Transmitter model;
+  int modus;
   
   public ConnectController(ChatView view,Transmitter model,int modus)
   {
     this.view = view;
     this.model = model;
+    this.modus = modus;
     if(modus==0)
     {
       Thread chatter = new Thread(model);
@@ -52,8 +54,15 @@ public class ConnectController implements ActionListener
   @Override
   public void actionPerformed(ActionEvent arg0)
   {
+    if(modus == 1)
+    {
     model.setIP_ADRESSE(view.getTxtzielIP().getText());
     Thread chatter = new Thread(model);
     chatter.start();
+    }
+    else
+    {
+      view.getChatanzeige().setText("Server kann sich nicht verbinden");
+    }
   }
 }
diff --git a/src/model/Transmitter.java b/src/model/Transmitter.java
index 1abe3ac..2603f28 100644
--- a/src/model/Transmitter.java
+++ b/src/model/Transmitter.java
@@ -27,7 +27,7 @@ public class Transmitter extends Observable implements Runnable
 {
   private static final Logger lg = OhmLogger.getLogger();
   private static final int PORT = 35000;
-  private String IP_ADRESSE = "127.0.0.1";
+  private String IP_ADRESSE = "";
 
   int modus;
   private String nachricht;
@@ -56,7 +56,13 @@ public class Transmitter extends Observable implements Runnable
       {
         sSocket = new ServerSocket(PORT);
         lg.info("Server: Warte auf Verbindung ...");
+        nachricht = "Server: Warte auf Verbindung ...";
+        setChanged();
+        notifyObservers();
         s = sSocket.accept(); // Achtung: blockiert!
+        nachricht = "Verbunden mit Client";
+        setChanged();
+        notifyObservers();
         lg.info("Server: Verbindung akzeptiert");
       }
       catch (IOException ex)
@@ -65,7 +71,10 @@ public class Transmitter extends Observable implements Runnable
       }
     }
     else if (modus == 1)
-    {
+    { 
+      nachricht = "Verbinden mit "+ IP_ADRESSE;
+      setChanged();
+      notifyObservers();
       lg.info("Client: verbinde ...");
       try
       {