From 928e6ae1afe179e9982c5852e2191dcbd31ab21b Mon Sep 17 00:00:00 2001 From: Js_Sman Date: Wed, 20 Dec 2023 17:35:53 +0100 Subject: [PATCH] =?UTF-8?q?Aufger=C3=A4umt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ChatProgramm/Start.java | 20 +---- .../controller/CommandController.java | 61 -------------- .../controller/GrafikController.java | 22 ++--- .../{model => controller}/ReceiveAdapter.java | 4 +- .../controller/commands/CommandConnect.java | 82 ------------------- .../controller/commands/CommandConnectV2.java | 1 + .../controller/commands/CommandInterface.java | 17 ---- .../controller/commands/CommandInvoker.java | 69 ---------------- .../controller/commands/CommandSend.java | 80 ------------------ .../controller/commands/CommandSendV2.java | 7 +- src/ChatProgramm/model/ChatModel.java | 5 -- src/ChatProgramm/model/Client.java | 4 +- src/ChatProgramm/model/GrafikDaten.java | 13 +-- src/ChatProgramm/model/Server.java | 4 +- src/ChatProgramm/model/Transmitter.java | 18 +--- .../model/TransmitterInterface.java | 16 ---- 16 files changed, 24 insertions(+), 399 deletions(-) delete mode 100644 src/ChatProgramm/controller/CommandController.java rename src/ChatProgramm/{model => controller}/ReceiveAdapter.java (92%) delete mode 100644 src/ChatProgramm/controller/commands/CommandConnect.java delete mode 100644 src/ChatProgramm/controller/commands/CommandInterface.java delete mode 100644 src/ChatProgramm/controller/commands/CommandInvoker.java delete mode 100644 src/ChatProgramm/controller/commands/CommandSend.java delete mode 100644 src/ChatProgramm/model/TransmitterInterface.java diff --git a/src/ChatProgramm/Start.java b/src/ChatProgramm/Start.java index 8938b96..07b9b1f 100644 --- a/src/ChatProgramm/Start.java +++ b/src/ChatProgramm/Start.java @@ -5,13 +5,12 @@ package ChatProgramm; -//import ChatProgramm.controller.CommandController; import ChatProgramm.controller.GrafikController; import ChatProgramm.controller.commands.CommandConnectV2; import ChatProgramm.controller.commands.CommandSendV2; import ChatProgramm.model.ChatModel; import ChatProgramm.model.GrafikDaten; -import ChatProgramm.model.ReceiveAdapter; +import ChatProgramm.controller.ReceiveAdapter; import ChatProgramm.view.ChatView; import ChatProgramm.view.GrafikView; import javax.swing.JOptionPane; @@ -41,24 +40,9 @@ public class Start CommandSendV2 cSend = new CommandSendV2(view, model); cSend.registerEvents(); - - ReceiveAdapter rAdapter = new ReceiveAdapter(view, model); model.addSubscription(rAdapter); - - - -// -// -// GrafikController controller = new GrafikController(zeichenflaeche, model); -// controller.registerEvents(); -// -// CommandController controller_commands = new CommandController(view, model, controller, zeichenflaeche); -// controller_commands.registerEvents(); -// controller_commands.registerCommands(); - - - + view.setVisible(true); } diff --git a/src/ChatProgramm/controller/CommandController.java b/src/ChatProgramm/controller/CommandController.java deleted file mode 100644 index bb7198a..0000000 --- a/src/ChatProgramm/controller/CommandController.java +++ /dev/null @@ -1,61 +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; -// -//import ChatProgramm.controller.commands.CommandConnect; -//import ChatProgramm.controller.commands.CommandInvoker; -//import ChatProgramm.controller.commands.CommandSend; -//import ChatProgramm.model.GrafikDaten; -//import ChatProgramm.view.ChatView; -//import ChatProgramm.view.GrafikView; -//import java.awt.Component; -//import java.awt.event.ActionEvent; -//import java.awt.event.ActionListener; -// -///** -// * -// * @author ahren -// */ -//public class CommandController implements ActionListener{ -// -// private ChatView view; -// private GrafikDaten model; -// private GrafikView gView; -// private CommandInvoker invoker; -// private GrafikController controller; -// -//public CommandController(ChatView view, GrafikDaten model, GrafikController controller, GrafikView gView){ -// this.view = view; -// this.model = model; -// this.gView = gView; -// this.invoker = new CommandInvoker(); -// this.controller = controller; -// } -// -// public void registerEvents(){ -// view.getBtnConnect().addActionListener(this); -// } -// -// public void registerCommands(){ -// CommandSend commandSend = new CommandSend(view.getGvZeichenflaeche(), model); -// invoker.addCommand(view.getBtnConnect(), new CommandConnect(view, commandSend, model, gView)); -// this.controller.setCommand(commandSend); -// } -// -// /** -// * Ausführen des jeweiligen Kommandos -// * @param e Referenz auf das Event -// */ -// @Override -// public void actionPerformed(ActionEvent e) { -// Component key = (Component)e.getSource(); -// invoker.executeCommand(key); -// -// } -// -//} -// -// diff --git a/src/ChatProgramm/controller/GrafikController.java b/src/ChatProgramm/controller/GrafikController.java index bf054fa..7518d05 100644 --- a/src/ChatProgramm/controller/GrafikController.java +++ b/src/ChatProgramm/controller/GrafikController.java @@ -5,19 +5,17 @@ package ChatProgramm.controller; -//import ChatProgramm.controller.commands.CommandSend; -import java.awt.Point; + +import ChatProgramm.model.ChatModel; +import ChatProgramm.util.OhmLogger; +import ChatProgramm.view.ChatView; + +import java.awt.*; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionListener; import java.util.logging.Logger; -import ChatProgramm.model.ChatModel; -import ChatProgramm.model.GrafikDaten; -import ChatProgramm.util.OhmLogger; -import ChatProgramm.view.ChatView; -import ChatProgramm.view.GrafikView; - /** * * @author le @@ -27,7 +25,6 @@ public class GrafikController extends MouseAdapter implements MouseMotionListene private static Logger lg = OhmLogger.getLogger(); private ChatView view; private ChatModel model; -// private CommandSend commandSend; public GrafikController(ChatView view, ChatModel model) { @@ -42,8 +39,6 @@ public class GrafikController extends MouseAdapter implements MouseMotionListene view.getGvZeichenflaeche().addMouseListener(this); } - - @Override public void mouseDragged(MouseEvent evt) { @@ -53,11 +48,6 @@ public class GrafikController extends MouseAdapter implements MouseMotionListene view.getGvZeichenflaeche().drawPoint(); } - @Override - public void mouseMoved(MouseEvent e) - { - } - @Override public void mouseReleased(MouseEvent evt) { diff --git a/src/ChatProgramm/model/ReceiveAdapter.java b/src/ChatProgramm/controller/ReceiveAdapter.java similarity index 92% rename from src/ChatProgramm/model/ReceiveAdapter.java rename to src/ChatProgramm/controller/ReceiveAdapter.java index 3a7d484..57d527b 100644 --- a/src/ChatProgramm/model/ReceiveAdapter.java +++ b/src/ChatProgramm/controller/ReceiveAdapter.java @@ -2,8 +2,10 @@ * 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; +package ChatProgramm.controller; +import ChatProgramm.model.ChatModel; +import ChatProgramm.model.Figur; import ChatProgramm.util.OhmLogger; import ChatProgramm.view.ChatView; import ChatProgramm.view.GrafikView; diff --git a/src/ChatProgramm/controller/commands/CommandConnect.java b/src/ChatProgramm/controller/commands/CommandConnect.java deleted file mode 100644 index fbbc6df..0000000 --- a/src/ChatProgramm/controller/commands/CommandConnect.java +++ /dev/null @@ -1,82 +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.commands; -// -//import ChatProgramm.model.Client; -//import ChatProgramm.model.GrafikDaten; -//import ChatProgramm.model.Server; -//import ChatProgramm.util.OhmLogger; -//import ChatProgramm.view.ChatView; -//import ChatProgramm.view.GrafikView; -//import java.io.IOException; -//import java.util.logging.Logger; -//import javax.swing.JDialog; -//import javax.swing.JRadioButton; -// -///** -// * -// * @author ahren -// */ -//public class CommandConnect implements CommandInterface -//{ -// private JRadioButton rBtnServer; -// private JRadioButton rBtnClient; -// private JDialog dialogFenster; -// private static Logger lg = OhmLogger.getLogger(); -// private CommandSend commandSend; -// private ChatView view; -// private GrafikDaten model; -// private GrafikView gView; -// -// public CommandConnect(ChatView view, CommandInterface value, GrafikDaten model, GrafikView gView) -// { -// rBtnServer = view.getBtnServer(); -// rBtnClient = view.getBtnClient(); -// dialogFenster = view.getjDialog1(); -// -// commandSend = (CommandSend) value; -// -// this.view = view; -// this.model = model; -// this.gView = gView; -// } -// -// @Override -// public void execute() -// { -// if(rBtnServer.isSelected()){ -// lg.info("Server ausgewählt"); -// try { -// commandSend.setTransmitter(new Server(view, model, gView)); -// } catch (IOException ex) { -// lg.info("Die Verbindung zum Server ist Fehlgeschlagen"); -// } -// } -// -// if(rBtnClient.isSelected()){ -// lg.info("Client ausgewählt"); -// try { -// commandSend.setTransmitter(new Client(view, model, gView)); -// } catch (IOException ex) { -// lg.info("Die Verbindung zum Client ist Fehlgeschlagen"); -// -// } -// } -// -// dialogFenster.setVisible(false); -// } -// -// @Override -// public boolean isUndoable() -// { -// return false; -// } -// -// @Override -// public void undo() -// { -// } -//} \ No newline at end of file diff --git a/src/ChatProgramm/controller/commands/CommandConnectV2.java b/src/ChatProgramm/controller/commands/CommandConnectV2.java index fe31fa0..ca0d3fa 100644 --- a/src/ChatProgramm/controller/commands/CommandConnectV2.java +++ b/src/ChatProgramm/controller/commands/CommandConnectV2.java @@ -9,6 +9,7 @@ import ChatProgramm.model.Client; import ChatProgramm.model.Server; import ChatProgramm.util.OhmLogger; import ChatProgramm.view.ChatView; + import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.IOException; diff --git a/src/ChatProgramm/controller/commands/CommandInterface.java b/src/ChatProgramm/controller/commands/CommandInterface.java deleted file mode 100644 index 77bd988..0000000 --- a/src/ChatProgramm/controller/commands/CommandInterface.java +++ /dev/null @@ -1,17 +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.commands; - -/** - * - * @author ahren - */ -public interface CommandInterface -{ - public void execute(); - public void undo(); - public boolean isUndoable(); -} diff --git a/src/ChatProgramm/controller/commands/CommandInvoker.java b/src/ChatProgramm/controller/commands/CommandInvoker.java deleted file mode 100644 index 5162f05..0000000 --- a/src/ChatProgramm/controller/commands/CommandInvoker.java +++ /dev/null @@ -1,69 +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.commands; - -import java.awt.Component; -import java.util.HashMap; -import java.util.Stack; - -/** - * - * @author ahren - */ -public class CommandInvoker { - - private HashMap commands; - private Stack undoStack; - - public CommandInvoker(){ - commands = new HashMap<>(); - undoStack = new Stack(); - } - - /** - * Fügt ein Kommando zur Kommando-"Datenbank" = HashMap hinzu - * @param key Quelle des Events - * @param value Referenz auf das zugehörige Kommando-Objekt - */ - public void addCommand(Component key, CommandInterface value){ - commands.put(key, value); - } - - /** - * Führt Kommando der Eventquelle "key" aus und legt die Referenz - * des Kommando in den Undo-Stack - * @param key Referenz auf die Eventquelle - */ - public void executeCommand(Component key){ - CommandInterface command = commands.get(key); - command.execute(); - if (command.isUndoable()) - { - undoStack.push(command); - } - } - /** - * Falls der Stack Elemente enthält, wird das oberste Element geholt - * und die Methode "undo" des Commands aufgerufen - */ - public void undoCommand() - { - if (!undoStack.isEmpty()) - { - undoStack.pop().undo(); - } - } - - /** - * Löscht bei Öffnen einer neuen Datei den Stack - */ - public void deleteStack() - { - while(!undoStack.isEmpty()) - undoStack.pop(); - } - -} diff --git a/src/ChatProgramm/controller/commands/CommandSend.java b/src/ChatProgramm/controller/commands/CommandSend.java deleted file mode 100644 index d3975b9..0000000 --- a/src/ChatProgramm/controller/commands/CommandSend.java +++ /dev/null @@ -1,80 +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.commands; -// -//import ChatProgramm.model.*; -//import ChatProgramm.util.OhmLogger; -//import ChatProgramm.view.ChatView; -// -//import java.awt.event.MouseAdapter; -//import java.awt.event.MouseMotionListener; -//import java.util.logging.Logger; -//import javax.swing.JTextField; -//import ChatProgramm.view.GrafikView; -// -///** -// * -// * @author ahren -// */ -//public class CommandSend extends MouseAdapter implements MouseMotionListener -//{ -// private static Logger lg = OhmLogger.getLogger(); -// -// private ChatView view; -// private ChatModel model; -// -// -// -// -// -// -// public CommandSend(ChatView view, ChatModel model) -// { -// this.view = view; -// this.model = model; -// //ToDo: Hier muss auch der gFrame referenziert werden -// //this.eingabeFeld = view.getTfNachricht(); -// transmitterInterface = null; -// } -// -// @Override -// public void execute() -// { -// Figur aktuelleFigur = model.getFiguren().getLast(); -// try -// { -// transmitterInterface.send(aktuelleFigur); -// -// } -// catch(Exception NullPointerExeption) -// { -// lg.info("Der Transmitter ist null"); -// } -// } -// -// -// @Override -// public boolean isUndoable() -// { -// return false; -// } -// -// @Override -// public void undo() -// { -// } -// -// void setTransmitter(TransmitterInterface transmitter) { -// lg.info("Transmitter wird gesetzt"); -// if(transmitter != null){ -// this.transmitterInterface = transmitter; -// -// } -// else{ -// lg.info("der transmitter kommt hier als null an"); -// } -// } -//} diff --git a/src/ChatProgramm/controller/commands/CommandSendV2.java b/src/ChatProgramm/controller/commands/CommandSendV2.java index 4daf0a7..95f651c 100644 --- a/src/ChatProgramm/controller/commands/CommandSendV2.java +++ b/src/ChatProgramm/controller/commands/CommandSendV2.java @@ -5,13 +5,12 @@ package ChatProgramm.controller.commands; import ChatProgramm.model.ChatModel; -import ChatProgramm.model.Client; -import ChatProgramm.model.Server; import ChatProgramm.util.OhmLogger; import ChatProgramm.view.ChatView; -import java.awt.event.*; -import java.io.IOException; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.MouseMotionListener; import java.util.logging.Logger; /** diff --git a/src/ChatProgramm/model/ChatModel.java b/src/ChatProgramm/model/ChatModel.java index a75cc54..a4d0d8f 100644 --- a/src/ChatProgramm/model/ChatModel.java +++ b/src/ChatProgramm/model/ChatModel.java @@ -4,11 +4,6 @@ */ package ChatProgramm.model; -import ChatProgramm.controller.GrafikController; -//import ChatProgramm.controller.commands.CommandConnect; -import ChatProgramm.controller.commands.CommandConnectV2; -//import ChatProgramm.controller.commands.CommandSend; -import ChatProgramm.controller.commands.CommandSendV2; import ChatProgramm.util.OhmLogger; import java.util.concurrent.Flow; diff --git a/src/ChatProgramm/model/Client.java b/src/ChatProgramm/model/Client.java index 816598c..9924174 100644 --- a/src/ChatProgramm/model/Client.java +++ b/src/ChatProgramm/model/Client.java @@ -6,10 +6,10 @@ package ChatProgramm.model; import ChatProgramm.util.OhmLogger; import ChatProgramm.view.ChatView; -import ChatProgramm.view.GrafikView; + import java.io.IOException; import java.net.Socket; -import java.util.logging.*; +import java.util.logging.Logger; /** * Builder Class diff --git a/src/ChatProgramm/model/GrafikDaten.java b/src/ChatProgramm/model/GrafikDaten.java index 58fa342..40988ab 100644 --- a/src/ChatProgramm/model/GrafikDaten.java +++ b/src/ChatProgramm/model/GrafikDaten.java @@ -4,21 +4,14 @@ */ package ChatProgramm.model; -import java.awt.Point; -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; +import ChatProgramm.util.OhmLogger; + +import java.awt.*; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.logging.Logger; import java.util.prefs.Preferences; -import ChatProgramm.util.OhmLogger; /** * diff --git a/src/ChatProgramm/model/Server.java b/src/ChatProgramm/model/Server.java index 75f411a..a9e5079 100644 --- a/src/ChatProgramm/model/Server.java +++ b/src/ChatProgramm/model/Server.java @@ -7,10 +7,10 @@ package ChatProgramm.model; import ChatProgramm.util.OhmLogger; import ChatProgramm.view.ChatView; -import ChatProgramm.view.GrafikView; + import java.io.IOException; import java.net.ServerSocket; -import java.util.logging.*; +import java.util.logging.Logger; /** * Builder Class diff --git a/src/ChatProgramm/model/Transmitter.java b/src/ChatProgramm/model/Transmitter.java index a77f1f9..f4ee4d9 100644 --- a/src/ChatProgramm/model/Transmitter.java +++ b/src/ChatProgramm/model/Transmitter.java @@ -4,26 +4,14 @@ */ package ChatProgramm.model; +import ChatProgramm.controller.ReceiveAdapter; import ChatProgramm.util.OhmLogger; import ChatProgramm.view.ChatView; -import ChatProgramm.view.GrafikView; -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.io.PrintWriter; -import java.io.UnsupportedEncodingException; +import java.io.*; import java.net.Socket; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import java.util.concurrent.Flow; import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.SubmissionPublisher; import java.util.logging.Level; @@ -83,8 +71,6 @@ public abstract class Transmitter implements Runnable { lg.info("Reader / Writer Initialisierung abgeschlossen"); startempfangen(); - } 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); } diff --git a/src/ChatProgramm/model/TransmitterInterface.java b/src/ChatProgramm/model/TransmitterInterface.java deleted file mode 100644 index 1b88ebd..0000000 --- a/src/ChatProgramm/model/TransmitterInterface.java +++ /dev/null @@ -1,16 +0,0 @@ -/* - * 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; - -/** - * - * @author ahren - */ -public interface TransmitterInterface -{ - public void send(Figur figur); - public Figur receive(); - -}