ahrensan79600/Aufgabe10_ChatProgramm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bisschen aufgeräumt

Browse Source
This commit is contained in:
ahren 2023-12-13 13:53:07 +01:00
parent e617b11f86
commit de596fad8c
6 changed files with 65 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ChatProgramm/Start.java
View File

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

10
src/ChatProgramm/controller/CommandController.java
View File

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

1
src/ChatProgramm/controller/commands/CommandConnect.java
View File

@ -10,7 +10,6 @@ import ChatProgramm.model.Server;
import ChatProgramm.util.OhmLogger; import ChatProgramm.util.OhmLogger;
import ChatProgramm.view.ChatView; import ChatProgramm.view.ChatView;
import java.io.IOException; import java.io.IOException;
import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.swing.JDialog; import javax.swing.JDialog;
import javax.swing.JRadioButton; import javax.swing.JRadioButton;

1
src/ChatProgramm/controller/commands/CommandInterface.java
View File

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

13
src/ChatProgramm/model/Nachricht.java
View File

@ -12,24 +12,12 @@ package ChatProgramm.model;
public class Nachricht public class Nachricht
{ {
private String nachricht; private String nachricht;
//private int id;
public Nachricht(String nachricht) public Nachricht(String nachricht)
{ {
this.nachricht = nachricht; this.nachricht = nachricht;
//this.id = id;
} }
/**
* @return the id
*/
// public int getId() {
// return id;
// }
/** /**
* @return the nachricht * @return the nachricht
*/ */
@ -40,5 +28,4 @@ public class Nachricht
public void setNachricht(String nachricht) { public void setNachricht(String nachricht) {
this.nachricht = nachricht; this.nachricht = nachricht;
} }
} }

29
src/ChatProgramm/model/Transmitter.java
View File

@ -13,7 +13,6 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.ServerSocket;
import java.net.Socket; import java.net.Socket;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
@ -91,19 +90,6 @@ public abstract class Transmitter implements Runnable, Subscriber<String>, Trans
writer.flush(); writer.flush();
lg.info("Nachricht gesendet"); lg.info("Nachricht gesendet");
textPublisher.submit(nachricht); textPublisher.submit(nachricht);
//
// String nachricht = in.readLine(); // ACHTUNG blockiert
// lg.info("Client: Serverbestätigung erhalten");
//
// lg.info("Client: fertig");
// in.close();
// out.close();
// s.close();
// in.close();
// out.close();
// s.close();
} }
public Nachricht receive(){ public Nachricht receive(){
Nachricht nachricht = new Nachricht(""); Nachricht nachricht = new Nachricht("");
@ -118,22 +104,24 @@ public abstract class Transmitter implements Runnable, Subscriber<String>, Trans
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
return nachricht; return nachricht;
} }
// public void disconnect (){
// in.close();
// out.close();
// s.close();
// }
@Override @Override
public void run() { public void run() {
while (true) { while (true) {
lg.info("Warte auf Nachricht"); lg.info("Warte auf Nachricht");
if(laufend) { if(laufend) {
Nachricht eingehendeNachricht = receive(); Nachricht eingehendeNachricht = receive();
if(!eingehendeNachricht.getNachricht().isEmpty()){ if(!eingehendeNachricht.getNachricht().isEmpty()){
textPublisher.submit(eingehendeNachricht); textPublisher.submit(eingehendeNachricht);
} }
} }
else{ else{
break; break;
@ -167,15 +155,10 @@ public abstract class Transmitter implements Runnable, Subscriber<String>, Trans
synchronized (this){ synchronized (this){
laufend = true; laufend = true;
} }
if (eService == null){ if (eService == null){
eService = Executors.newSingleThreadExecutor(); eService = Executors.newSingleThreadExecutor();
eService.execute(this); eService.execute(this);
} }
lg.info("Starte Chat"); lg.info("Starte Chat");
} }
} }