src/ChatProgramm/Client.java

@@ -0,0 +1,79 @@
+/*
+ * 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;
+
+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.net.Socket;
+import java.util.logging.*;
+
+/**
+ * Builder Class
+ * @author le
+ */
+public class Client
+{
+  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() throws IOException
+  {
+    lg.info("Client: versuche zu verbinden");
+    Socket s = new Socket(IP, PORT); // ACHTUNG blockiert!
+    lg.info("Client: Verbindung akzeptiert");
+    
+    InputStream is = s.getInputStream();
+    OutputStream os = s.getOutputStream();
+    
+    //Umwandlung der Byteströme
+    InputStreamReader isr = new InputStreamReader(is, "UTF-8");
+    OutputStreamWriter osr = new OutputStreamWriter(os, "UTF-8");
+    
+    //Puffer
+    BufferedReader in = new BufferedReader(isr);
+    //BufferedWriter out = new BufferedWriter(osr);
+    //besser
+    PrintWriter out = new PrintWriter(osr);
+    
+    lg.info("Client: Streams erfolgreich initialisiert");
+    lg.info("Client: sende Textnachricht");
+    
+    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();
+  }
+
+  /**
+   * @param args the command line arguments
+   */
+  public static void main(String[] args) 
+  {
+    try
+    {
+      new Client();
+    }
+    catch (IOException ex)
+    {
+      Logger.getLogger(Client.class.getName()).log(Level.SEVERE, null, ex);
+    }
+  }
+}

src/ChatProgramm/Server.java

@@ -0,0 +1,81 @@
+/*
+ * 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;
+
+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.net.ServerSocket;
+import java.net.Socket;
+import java.util.logging.*;
+
+/**
+ * Builder Class
+ * @author le
+ */
+public class Server
+{
+  private static Logger lg = Logger.getLogger("netz");
+  private static final int PORT = 35000; //lt. iana port > 2¹⁵
+  
+  
+  public Server() throws IOException
+  {
+    ServerSocket sSocket = new ServerSocket(PORT);
+    lg.info("Server: warte auf Verbindung");
+    Socket s = sSocket.accept(); // ACHTUNG blockiert!
+    
+    lg.info("Server: Verbindung akzeptiert");
+    
+    InputStream is = s.getInputStream();
+    OutputStream os = s.getOutputStream();
+    
+    //Umwandlung der Byteströme
+    InputStreamReader isr = new InputStreamReader(is, "UTF-8");
+    OutputStreamWriter osr = new OutputStreamWriter(os, "UTF-8");
+    
+    //Puffer
+    BufferedReader in = new BufferedReader(isr);
+    //BufferedWriter out = new BufferedWriter(osr);
+    //besser
+    PrintWriter out = new PrintWriter(osr);
+    
+    lg.info("Server: Streams erfolgreich initialisiert");
+    lg.info("Server: warte auf Textnachricht");
+    
+    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();
+  }
+
+  /**
+   * @param args the command line arguments
+   */
+  public static void main(String[] args) 
+  {
+    try
+    {
+      new Server();
+    }
+    catch (IOException ex)
+    {
+      Logger.getLogger(Server.class.getName()).log(Level.SEVERE, null, ex);
+    }
+  }
+}

src/ChatProgramm/Start.java

@@ -19,10 +19,9 @@ public class Start
 {
   public Start()
   {
-    //Transmitter transmitter = new Transmitter();
+    Transmitter transmitter = new Transmitter();
     ChatView view = new ChatView();
-    //CommandController controller_commands = new CommandController(view, transmitter);
+    CommandController controller_commands = new CommandController(view, transmitter);
-    CommandController controller_commands = new CommandController(view);
     controller_commands.registerEvents();
     controller_commands.registerCommands();
     view.setVisible(true);

src/ChatProgramm/controller/CommandController.java

@@ -21,17 +21,12 @@ import java.awt.event.ActionListener;
 public class CommandController implements ActionListener{
     
     private ChatView view;
-    //private Transmitter transmitter;
+    private Transmitter transmitter;
     private CommandInvoker invoker;
     
-//    public CommandController(ChatView view, Transmitter transmitter){
+    public CommandController(ChatView view, Transmitter transmitter){
-//        this.view = view;
-//        this.transmitter = transmitter;
-//        this.invoker = new CommandInvoker();
-//    }
-    
-    public CommandController(ChatView view){
         this.view = view;
+        this.transmitter = transmitter;
         this.invoker = new CommandInvoker();
     }
     
@@ -41,7 +36,7 @@ public class CommandController implements ActionListener{
     }
     
     public void registerCommands(){
-        invoker.addCommand(view.getBtnConnect(), new CommandConnect(view));
+        invoker.addCommand(view.getBtnConnect(), new CommandConnect());
         invoker.addCommand(view.getTfNachricht(), new CommandSend());
     }
 

src/ChatProgramm/controller/commands/CommandConnect.java

@@ -5,57 +5,20 @@
 
 package ChatProgramm.controller.commands;
 
-import ChatProgramm.model.Client;
-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;
-
 /**
  *
  * @author ahren
  */
 public class CommandConnect implements CommandInterface
 {
-    private JRadioButton rBtnServer;
+  public CommandConnect()
-    private JRadioButton rBtnClient;
-    private JDialog dialogFenster;
-    private static Logger lg = OhmLogger.getLogger();
-    
-  public CommandConnect(ChatView view)
   {
-      rBtnServer = view.getBtnServer();
+  
-      rBtnClient = view.getBtnClient();
-      dialogFenster = view.getjDialog1();
   }
 
   @Override
   public void execute()
   {
-      if(rBtnServer.isSelected()){
-          lg.info("Server ausgewählt");
-          try {
-              new Server();
-          } catch (IOException ex) {
-              lg.info("Die Verbindung zum Server ist Fehlgeschlagen");
-          }
-      }
-      
-      if(rBtnClient.isSelected()){
-          lg.info("Client ausgewählt");
-          try {
-              new Client();
-          } catch (IOException ex) {
-              lg.info("Die Verbindung zum Client ist Fehlgeschlagen");
-
-          }
-      }
-      
-      dialogFenster.setVisible(false);
   }
 
   @Override

src/ChatProgramm/model/Client.java

@@ -1,86 +0,0 @@
-/*
- * 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 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.net.ServerSocket;
-import java.net.Socket;
-import java.util.logging.*;
-
-/**
- * Builder Class
- *
- * @author le
- */
-public class Client extends Transmitter {
-
-    private static Logger lg = Logger.getLogger("netz");
-
-    private Socket socket;
-    private BufferedReader reader;
-    private PrintWriter writer;
-
-    private static final int PORT = 35000; //lt. iana port > 2¹⁵
-    private static final String IP = "127.0.0.1";
-
-    public Client() throws IOException {
-        connect();
-
-//        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();
-    }
-
-    /**
-     * @param args the command line arguments
-     */
-    public static void main(String[] args) {
-        try {
-            new Client();
-        } catch (IOException ex) {
-            Logger.getLogger(Client.class.getName()).log(Level.SEVERE, null, ex);
-        }
-    }
-
-    @Override
-    public void connect() throws IOException {
-        try {
-            lg.info("Client: Verbindung wird aufgebaut");
-            socket = new Socket(IP, PORT);
-            lg.info("Client: Verbindung aufgebaut");
-
-            lg.info("Client: initialisiere reader und writer");
-            InputStream is = socket.getInputStream();
-            OutputStream os = socket.getOutputStream();
-
-            InputStreamReader isr = new InputStreamReader(is, "UTF-8");
-            OutputStreamWriter osr = new OutputStreamWriter(os, "UTF-8");
-
-            reader = new BufferedReader(isr);
-            writer = new PrintWriter(osr);
-            lg.info("Client: Initialisierung abgeschlossen");
-
-            lg.info("Client: warte auf Nachricht");
-
-        } catch (java.io.InterruptedIOException e) {
-            lg.warning("Timeout" + "(" + timeout / 1000 + "s)");
-        }
-    }
-}

src/ChatProgramm/model/Server.java

@@ -1,96 +0,0 @@
-/*
- * 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 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.net.ServerSocket;
-import java.net.Socket;
-import java.util.logging.*;
-
-/**
- * Builder Class
- * @author le
- */
-public class Server extends Transmitter
-{
-  private static Logger lg = Logger.getLogger("netz");
-  
-  private Socket socket;
-  private BufferedReader reader;
-  private PrintWriter writer;
-  
-  private static final int PORT = 35000; //lt. iana port > 2¹⁵
-  
-  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");
-          
-          lg.info("Server: initialisiere reader und writer");
-          InputStream is = socket.getInputStream();
-          OutputStream os = socket.getOutputStream();
-          
-          InputStreamReader isr = new InputStreamReader(is, "UTF-8");
-          OutputStreamWriter osr = new OutputStreamWriter(os, "UTF-8");
-          
-          reader = new BufferedReader(isr);
-          writer = new PrintWriter(osr);
-          lg.info("Server: Initialisierung abgeschlossen");
-          
-          lg.info("Server: warte auf Nachricht");
- 
-      }
-      catch ( java.io.InterruptedIOException e )
-      {
-          lg.warning("Timeout"+"("+timeout/1000+"s)");
-      }
-      
-  }
-  public Server() throws IOException
-  {
-      connect();
-    
-//    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();
-  }
-
-  /**
-   * @param args the command line arguments
-   */
-  public static void main(String[] args) 
-  {
-    try
-    {
-      new Server();
-    }
-    catch (IOException ex)
-    {
-      Logger.getLogger(Server.class.getName()).log(Level.SEVERE, null, ex);
-    }
-  }
-}

src/ChatProgramm/model/Transmitter.java

@@ -2,88 +2,22 @@
  * 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;
 
-import java.io.BufferedReader;
+package ChatProgramm.model;
-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.concurrent.Flow;
-import java.util.concurrent.Flow.Subscriber;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  *
  * @author ahren
  */
-public abstract class Transmitter implements Runnable, Subscriber<String> {
+public class Transmitter implements Runnable
+{
+  public Transmitter()
+  {
   
-    static final int timeout = 60000;
+  }
-    private static final int PORT = 35000;
-
-    private static Logger lg = Logger.getLogger("netz");
-
-    private Socket socket;
-    private BufferedReader reader;
-    private PrintWriter writer;
-
-    public Transmitter() {
-
-    }
-
-    public abstract void connect() throws IOException;
-
-    public void initIO() {
-        try {
-            lg.info("Initialisiere reader und writer");
-            InputStream is = socket.getInputStream();
-            OutputStream os = socket.getOutputStream();
-
-            InputStreamReader isr = new InputStreamReader(is, "UTF-8");
-            OutputStreamWriter osr = new OutputStreamWriter(os, "UTF-8");
-
-            reader = new BufferedReader(isr);
-            writer = new PrintWriter(osr);
-            lg.info("Server: Initialisierung abgeschlossen");
-
-            lg.info("Server: 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);
-        }
-    }
-
-    @Override
-    public void run() {
-    }
-
-    @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
-    }
-
-    @Override
-    public void onComplete() {
-        throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
-    }
 
+  @Override
+  public void run()
+  {
+  }
 }