From be76f829e99fc860735578490d21b0c773308612 Mon Sep 17 00:00:00 2001 From: Apollo Date: Wed, 29 May 2019 11:57:25 +0200 Subject: [PATCH] fast fast fertig --- src/chatprogramm/Start.java | 6 ++-- src/controller/ConnectController.java | 37 ++++++++++++++++++++-- src/model/Transmitter.java | 10 +++++- src/view/ChatView.form | 34 +++++++++++++++++++++ src/view/ChatView.java | 44 +++++++++++++++++++++++++++ 5 files changed, 124 insertions(+), 7 deletions(-) diff --git a/src/chatprogramm/Start.java b/src/chatprogramm/Start.java index 3869257..525b7d7 100644 --- a/src/chatprogramm/Start.java +++ b/src/chatprogramm/Start.java @@ -38,10 +38,8 @@ public class Start if(entscheidung==1) view.setTitle("Client"); Transmitter model = new Transmitter(entscheidung); - ConnectController conncontroller = new ConnectController(view,model); - - Thread chatter = new Thread(model); - chatter.start(); + ConnectController conncontroller = new ConnectController(view,model,entscheidung); + conncontroller.registerEvents(); SendController sendcontroller = new SendController(view,model); sendcontroller.registerEvents(); diff --git a/src/controller/ConnectController.java b/src/controller/ConnectController.java index 170bf08..e535dcd 100644 --- a/src/controller/ConnectController.java +++ b/src/controller/ConnectController.java @@ -6,6 +6,12 @@ package controller; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.logging.Level; +import java.util.logging.Logger; import model.Transmitter; import view.ChatView; @@ -13,14 +19,41 @@ import view.ChatView; * * @author Apollo */ -public class ConnectController +public class ConnectController implements ActionListener { ChatView view; Transmitter model; - public ConnectController(ChatView view,Transmitter model) + public ConnectController(ChatView view,Transmitter model,int modus) { this.view = view; this.model = model; + if(modus==0) + { + Thread chatter = new Thread(model); + chatter.start(); + } + try + { + String t; + t = InetAddress.getLocalHost().getHostAddress(); + view.getTxteigeneIP().setText(t); + } + catch (UnknownHostException ex) + { + Logger.getLogger(ConnectController.class.getName()).log(Level.SEVERE, null, ex); + } + + } + public void registerEvents() + { + view.getBtnverbinden().addActionListener(this); + } + @Override + public void actionPerformed(ActionEvent arg0) + { + model.setIP_ADRESSE(view.getTxtzielIP().getText()); + Thread chatter = new Thread(model); + chatter.start(); } } diff --git a/src/model/Transmitter.java b/src/model/Transmitter.java index 535b335..1abe3ac 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 static final String IP_ADRESSE = "127.0.0.1"; + private String IP_ADRESSE = "127.0.0.1"; int modus; private String nachricht; @@ -151,4 +151,12 @@ public class Transmitter extends Observable implements Runnable return nachricht; } + /** + * @param IP_ADRESSE the IP_ADRESSE to set + */ + public void setIP_ADRESSE(String IP_ADRESSE) + { + this.IP_ADRESSE = IP_ADRESSE; + } + } diff --git a/src/view/ChatView.form b/src/view/ChatView.form index 48b023e..c1f76df 100644 --- a/src/view/ChatView.form +++ b/src/view/ChatView.form @@ -77,6 +77,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/view/ChatView.java b/src/view/ChatView.java index ace4558..0e4e8cc 100644 --- a/src/view/ChatView.java +++ b/src/view/ChatView.java @@ -11,6 +11,28 @@ package view; */ public class ChatView extends javax.swing.JFrame { + /** + * @return the btnverbinden + */ + public javax.swing.JButton getBtnverbinden() + { + return btnverbinden; + } + /** + * @return the txteigeneIP + */ + public javax.swing.JTextField getTxteigeneIP() + { + return txteigeneIP; + } + + /** + * @return the txtzielIP + */ + public javax.swing.JTextField getTxtzielIP() + { + return txtzielIP; + } /** * @param chatanzeige the chatanzeige to set */ @@ -56,6 +78,10 @@ public class ChatView extends javax.swing.JFrame jScrollPane3 = new javax.swing.JScrollPane(); chatanzeige = new javax.swing.JTextArea(); inputField = new javax.swing.JTextField(); + jPanel2 = new javax.swing.JPanel(); + txteigeneIP = new javax.swing.JTextField(); + txtzielIP = new javax.swing.JTextField(); + btnverbinden = new javax.swing.JButton(); jMenuBar1 = new javax.swing.JMenuBar(); jMenu1 = new javax.swing.JMenu(); jMenu2 = new javax.swing.JMenu(); @@ -72,6 +98,20 @@ public class ChatView extends javax.swing.JFrame jPanel1.add(jScrollPane3, java.awt.BorderLayout.CENTER); jPanel1.add(inputField, java.awt.BorderLayout.PAGE_END); + jPanel2.setMinimumSize(new java.awt.Dimension(0, 0)); + + txteigeneIP.setEditable(false); + txteigeneIP.setMinimumSize(new java.awt.Dimension(200, 26)); + jPanel2.add(txteigeneIP); + + txtzielIP.setText("192.168.0.1"); + jPanel2.add(txtzielIP); + + btnverbinden.setText("Verbinden"); + jPanel2.add(btnverbinden); + + jPanel1.add(jPanel2, java.awt.BorderLayout.PAGE_START); + getContentPane().add(jPanel1, java.awt.BorderLayout.CENTER); jMenu1.setText("File"); @@ -138,12 +178,16 @@ public class ChatView extends javax.swing.JFrame } // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JButton btnverbinden; private javax.swing.JTextArea chatanzeige; private javax.swing.JTextField inputField; private javax.swing.JMenu jMenu1; private javax.swing.JMenu jMenu2; private javax.swing.JMenuBar jMenuBar1; private javax.swing.JPanel jPanel1; + private javax.swing.JPanel jPanel2; private javax.swing.JScrollPane jScrollPane3; + private javax.swing.JTextField txteigeneIP; + private javax.swing.JTextField txtzielIP; // End of variables declaration//GEN-END:variables }