richtiger Chat

src/ChatProgramm/Start.java

@@ -6,7 +6,6 @@
 package ChatProgramm;
 
 import ChatProgramm.controller.CommandController;
-import ChatProgramm.model.Transmitter;
 import ChatProgramm.view.ChatView;
 import javax.swing.JOptionPane;
 import javax.swing.UIManager;
@@ -19,9 +18,7 @@ public class Start
 {
   public Start()
   {
-    //Transmitter transmitter = new Transmitter();
     ChatView view = new ChatView();
-    //CommandController controller_commands = new CommandController(view, transmitter);
     CommandController controller_commands = new CommandController(view);
     controller_commands.registerEvents();
     controller_commands.registerCommands();

src/ChatProgramm/controller/CommandController.java

@@ -8,7 +8,6 @@ package ChatProgramm.controller;
 import ChatProgramm.controller.commands.CommandConnect;
 import ChatProgramm.controller.commands.CommandInvoker;
 import ChatProgramm.controller.commands.CommandSend;
-import ChatProgramm.model.Transmitter;
 import ChatProgramm.view.ChatView;
 import java.awt.Component;
 import java.awt.event.ActionEvent;
@@ -21,15 +20,8 @@ import java.awt.event.ActionListener;
 public class CommandController implements ActionListener{
     
     private ChatView view;
-    //private Transmitter transmitter;
     private CommandInvoker invoker;
         
-//    public CommandController(ChatView view, Transmitter transmitter){
-//        this.view = view;
-//        this.transmitter = transmitter;
-//        this.invoker = new CommandInvoker();
-//    }
-    
     public CommandController(ChatView view){
         this.view = view;
         this.invoker = new CommandInvoker();

src/ChatProgramm/controller/Nachricht.java

@@ -1,43 +0,0 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
-
-package ChatProgramm.controller;
-
-/**
- *
- * @author ahren
- */
-public class Nachricht 
-{
-    private String nachricht;
-    //private int id;
-    
-  public Nachricht(String nachricht)
-  {
-      this.setNachricht(nachricht);
-      //this.id = id;
-  
-  }
-  
-
-
-    /**
-     * @return the id
-     */
-//    public int getId() {
-//        return id;
-//    }
-
-    /**
-     * @return the nachricht
-     */
-    public String getNachricht() {
-        return nachricht;
-    }
-
-    public void setNachricht(String nachricht) {
-        this.nachricht = nachricht;
-    }
-}

src/ChatProgramm/controller/commands/CommandConnect.java

@@ -10,7 +10,6 @@ import ChatProgramm.model.Server;
 import ChatProgramm.util.OhmLogger;
 import ChatProgramm.view.ChatView;
 import java.io.IOException;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.swing.JDialog;
 import javax.swing.JRadioButton;
@@ -25,9 +24,7 @@ public class CommandConnect implements CommandInterface
     private JRadioButton rBtnClient;
     private JDialog dialogFenster;
     private static Logger lg = OhmLogger.getLogger();
-
     private CommandSend commandSend;
-
     private ChatView view;
     
     public CommandConnect(ChatView view, CommandInterface value)

src/ChatProgramm/controller/commands/CommandInterface.java

@@ -13,6 +13,5 @@ public interface CommandInterface
 {
   public void execute();
   public void undo();
-//  public void redo();
   public boolean isUndoable();
 }

src/ChatProgramm/controller/commands/CommandSend.java

@@ -5,17 +5,14 @@
 
 package ChatProgramm.controller.commands;
 
-import ChatProgramm.controller.Nachricht;
 import ChatProgramm.model.Client;
 import ChatProgramm.model.Server;
-import ChatProgramm.model.Transmitter;
 import ChatProgramm.model.TransmitterInterface;
 import ChatProgramm.util.OhmLogger;
 import ChatProgramm.view.ChatView;
-
-import java.util.Objects;
 import java.util.logging.Logger;
 import javax.swing.JTextField;
+import ChatProgramm.model.Nachricht;
 
 /**
  *
@@ -24,14 +21,16 @@ import javax.swing.JTextField;
 public class CommandSend implements CommandInterface
 {
   private static Logger lg = OhmLogger.getLogger();
-    
+  private JTextField eingabeFeld;
+  private String nachricht;
   private ChatView view;
   public TransmitterInterface transmitterInterface;
-    private JTextField eingabeFeld;
-    
   public Server server;
   public Client client;
 
+
+  
+    
   public CommandSend(ChatView view)
   {
       this.view = view;
@@ -43,11 +42,12 @@ public class CommandSend implements CommandInterface
   public void execute()
   {
       if(transmitterInterface != null && !eingabeFeld.getText().isEmpty()){
-          transmitterInterface.send(new Nachricht(eingabeFeld.getText()));
+          transmitterInterface.send(eingabeFeld.getText());
           eingabeFeld.setText("");
       }
   }
 
+
   @Override
   public boolean isUndoable()
   {

src/ChatProgramm/model/Client.java

@@ -4,9 +4,7 @@
  */
 package ChatProgramm.model;
 
-import ChatProgramm.util.OhmLogger;
 import ChatProgramm.view.ChatView;
-
 import java.io.IOException;
 import java.net.Socket;
 import java.util.logging.*;
@@ -18,26 +16,15 @@ import java.util.logging.*;
  */
 public class Client extends Transmitter {
 
-    private static Logger lg = OhmLogger.getLogger();
+    private static Logger lg = Logger.getLogger("netz");
+    private static final int PORT = 35000; //lt. iana port > 2¹⁵
+    private static final String IP = "127.0.0.1";
     
 
     public Client(ChatView view) throws IOException {
         super(view);
         connect();
         initIO();
-
-//        out.println("Hallo Du Server - ich bin ein Client");
-//        out.flush();
-//
-//        lg.info("Client: warte auf Serverantwort");
-//
-//        String nachricht = in.readLine(); // ACHTUNG blockiert
-//        lg.info("Client: Serverbestätigung erhalten");
-//
-//        lg.info("Client: fertig");
-//        in.close();
-//        out.close();
-//        s.close();
     }
 
 
@@ -47,11 +34,8 @@ public class Client extends Transmitter {
             lg.info("Client: Verbindung wird aufgebaut");
             socket = new Socket(IP, PORT);
             lg.info("Client: Verbindung aufgebaut");
-
         } catch (java.io.InterruptedIOException e) {
             lg.warning("Timeout" + "(" + timeout / 1000 + "s)");
         }
     }
-    
-
 }

src/ChatProgramm/model/Nachricht.java

@@ -0,0 +1,31 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+
+package ChatProgramm.model;
+
+/**
+ *
+ * @author ahren
+ */
+public class Nachricht 
+{
+  private String nachricht;
+    
+  public Nachricht(String nachricht)
+  {
+    this.nachricht = nachricht;
+  }
+
+  /**
+   * @return the nachricht
+   */
+  public String getNachricht() {
+    return nachricht;
+  }
+
+  public void setNachricht(String nachricht) {
+    this.nachricht = nachricht;
+  }
+}

src/ChatProgramm/model/ReceiveAdapter.java

@@ -2,7 +2,7 @@
  * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
  * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
  */
-package ChatProgramm.controller;
+package ChatProgramm.model;
 
 import ChatProgramm.view.ChatView;
 import java.util.concurrent.Flow;
@@ -29,7 +29,8 @@ public class ReceiveAdapter implements Subscriber<Nachricht> {
 
     @Override
     public void onNext(Nachricht item) {
-        view.getTxtChat().setText(item.getNachricht());
+
+        view.getTxtChat().append(item.getNachricht());
         this.subscription.request(1);
     }
 

src/ChatProgramm/model/Server.java

@@ -2,73 +2,44 @@
  * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
  * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Main.java to edit this template
  */
+
 package ChatProgramm.model;
 
-import ChatProgramm.model.Transmitter;
-import ChatProgramm.util.OhmLogger;
 import ChatProgramm.view.ChatView;
-
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
 import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.ArrayList;
-import java.util.concurrent.Flow;
-import java.util.concurrent.SubmissionPublisher;
 import java.util.logging.*;
 
 /**
  * Builder Class
- *
  * @author le
  */
-public class Server extends Transmitter {
-
-    private static Logger lg = OhmLogger.getLogger();
+public class Server extends Transmitter
+{
+  private static Logger lg = Logger.getLogger("netz");  
+  private static final int PORT = 35000; //lt. iana port > 2¹⁵
   
   
-    @Override
-    public void connect() throws IOException {
-        try {
+  public void connect() throws IOException
+  {
+      try
+      {
           ServerSocket sSocket = new ServerSocket(PORT);
           sSocket.setSoTimeout(timeout);
           lg.info("Server: warte auf Verbindung");
           socket = sSocket.accept();
           lg.info("Server: Verbindung akzeptiert");
-
-        } catch (java.io.InterruptedIOException e) {
+      }
+      catch ( java.io.InterruptedIOException e )
+      {
           lg.warning("Timeout"+"("+timeout/1000+"s)");
       }
-
   }
-
-
-
     public Server(ChatView view) throws IOException {
         super(view);
         connect();
         initIO();
 
-//    String nachricht = in.readLine(); // ACHTUNG blockiert
-//    lg.info("Server: Nachricht erhalten");
-//    System.out.println("Server: NACHRICHT = " + nachricht);
-//    
-//    // ACHTUNG: blockiert NICHT!!!!
-//    out.println("Server an Client: Nachricht erhalten");
-//    out.flush(); // wichtig
-//    
-//    lg.info("Server: fertig");
-//    in.close();
-//    out.close();
-//    s.close();
-    }
-
-
 
   }
+}

src/ChatProgramm/model/Transmitter.java

@@ -4,11 +4,7 @@
  */
 package ChatProgramm.model;
 
-import ChatProgramm.controller.Nachricht;
-import ChatProgramm.controller.ReceiveAdapter;
-import ChatProgramm.util.OhmLogger;
 import ChatProgramm.view.ChatView;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -16,6 +12,7 @@ import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
 import java.net.Socket;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -29,42 +26,44 @@ import java.util.logging.Logger;
  *
  * @author ahren
  */
-public abstract class Transmitter implements Runnable, Subscriber<Nachricht>, TransmitterInterface {
+public abstract class Transmitter implements Runnable, Subscriber<String>, TransmitterInterface {
 
-    static final int timeout = 30000;
-    protected static final int PORT = 35000;
-    protected static final String IP = "127.0.0.1";
+    static final int timeout = 60000;
+    private static final int PORT = 35000;
 
-    private static Logger lg = OhmLogger.getLogger();
+    private static Logger lg = Logger.getLogger("netz");
 
     protected Socket socket;
     protected BufferedReader reader;
     protected PrintWriter writer;
     
+    private Nachricht nachricht;
+    private String txtNachricht;
+    private boolean laufend;
     private SubmissionPublisher<Nachricht> textPublisher;
     private ExecutorService eService;
-    private boolean laufend = false;
-
+    private String receivedString;
     private ChatView view;
-
     private ReceiveAdapter receiveAdapter;
     
-    public Transmitter(ChatView view) {
+    public Transmitter(ChatView view)
+    {
       socket = new Socket();
       eService = null;
-        this.view = view;
-        textPublisher = new SubmissionPublisher<>();
-
       receiveAdapter = new ReceiveAdapter(view);
+      textPublisher = new SubmissionPublisher<>();
+      this.view = view;
       addWertSubscription(receiveAdapter);
+      nachricht = new Nachricht("");
+    }
+    
+     public void addWertSubscription(Subscriber<Nachricht> subscriber)
+    {
+      textPublisher.subscribe(subscriber);
     }
 
     public abstract void connect() throws IOException;
 
-    public void addWertSubscription(Subscriber<Nachricht> subscriber) {
-        textPublisher.subscribe(subscriber);
-    }
-
     public void initIO() {
       try {
         lg.info("Initialisiere reader und writer");
@@ -76,67 +75,55 @@ public abstract class Transmitter implements Runnable, Subscriber<Nachricht>, Tr
 
         reader = new BufferedReader(isr);
         writer = new PrintWriter(osr);
-            lg.info("Initialisierung abgeschlossen");
-
-            start();
+        lg.info("Reader / Writer Initialisierung abgeschlossen");
+        startempfangen();
+        lg.info("Warte auf Nachricht");
 
+      } catch (UnsupportedEncodingException ex) {
+        Logger.getLogger(Transmitter.class.getName()).log(Level.SEVERE, null, ex);
       } catch (IOException ex) {
         Logger.getLogger(Transmitter.class.getName()).log(Level.SEVERE, null, ex);
       }
     }
     
-    public void start(){
-        synchronized (this){
-            laufend = true;
-        }
+    public void send(String txtNachricht){
 
-        if (eService == null){
-            eService = Executors.newSingleThreadExecutor();
-            eService.execute(this);
-        }
-
-        lg.info("Starte Chat");
-    }
-
-    public void send(Nachricht nachricht) {
-        lg.info("Nachricht wird gesendet");
-        writer.println(nachricht.getNachricht());
+        writer.println(txtNachricht);
         writer.flush();
-
-        lg.info("Nachricht wird angezeigt");
+        lg.info("Nachricht gesendet");
+        nachricht.setNachricht("\nDu: " + txtNachricht);
         textPublisher.submit(nachricht);
     }
-
     public Nachricht receive(){
-        Nachricht nachricht = new Nachricht("");
       try {
-            String txtNachricht = reader.readLine();
+        txtNachricht = reader.readLine();
         if(!txtNachricht.isEmpty()){
           lg.info("Nachricht erhalten");
-                nachricht.setNachricht(txtNachricht);
+          nachricht.setNachricht("\nEr / Sie: " + txtNachricht);
           return nachricht;
         }
 
       } catch (IOException e) {
         throw new RuntimeException(e);
       }
-
-
       return nachricht;
     }
     
+//    public void disconnect (){
+//    in.close();
+//    out.close();
+//    s.close();
+//    }
     
     @Override
     public void run() {
       while (true) {
         lg.info("Warte auf Nachricht");
         if(laufend) {
-                Nachricht eingehendeNachricht = receive();
-
-                if(!eingehendeNachricht.getNachricht().isEmpty()){
-                    textPublisher.submit(eingehendeNachricht);
+          nachricht = receive();
+          if(!nachricht.getNachricht().isEmpty()){
+              textPublisher.submit(nachricht);
           }
-
         }
         else{
           break;
@@ -144,11 +131,17 @@ public abstract class Transmitter implements Runnable, Subscriber<Nachricht>, Tr
       }
     }
 
+
     @Override
     public void onSubscribe(Flow.Subscription subscription) {
         throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
     }
 
+    @Override
+    public void onNext(String item) {
+        throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
+    }
+
     @Override
     public void onError(Throwable throwable) {
         throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
@@ -159,9 +152,15 @@ public abstract class Transmitter implements Runnable, Subscriber<Nachricht>, Tr
         throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
     }
 
-    @Override
-    public void onNext(Nachricht item) {
-        throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
+  private void startempfangen()
+  {
+    synchronized (this){
+    laufend = true;
+    }
+    if (eService == null){
+        eService = Executors.newSingleThreadExecutor();
+        eService.execute(this);
+    }
+    lg.info("Starte Chat");
   }
-
 }

src/ChatProgramm/model/TransmitterInterface.java

@@ -1,8 +1,17 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Interface.java to edit this template
+ */
 package ChatProgramm.model;
 
-import ChatProgramm.controller.Nachricht;
-
-public interface TransmitterInterface{
-    public void send(Nachricht nachricht);
+import ChatProgramm.model.Nachricht;
+/**
+ *
+ * @author ahren
+ */
+public interface TransmitterInterface
+{
+    public void send(String txtNachricht);
     public Nachricht receive();
+
 }