duerrha71912/chat_prog
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge origin/master

Browse Source 
Conflicts:
	src/wuerfelthreads/Start.java
	src/wuerfelthreads/view/WuerfelView.form
	src/wuerfelthreads/view/WuerfelView.java
This commit is contained in:
BakeOrDie
2020-12-16 11:19:54 +01:00
parent 45e094d635
commit 1585766b5a
16 changed files with 2041 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/netz/Start.java
+1 -3
View File
@@ -6,9 +6,6 @@
package netz;
import java.io.IOException;
import java.net.MalformedURLException;
import javax.swing.JFrame;
import javax.swing.WindowConstants;
import netz.controller.ReceiveAdapter;
@@ -66,6 +63,7 @@ public class Start
JOptionPane.showMessageDialog(null, ex.toString());
}
new Start();
new Start();
}
}
src/netz/controller/CommandConnect.java
+3 -11
View File
@@ -9,8 +9,6 @@ package netz.controller;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.IOException;
import java.net.ServerSocket;
import java.net.Socket;
import java.util.logging.Logger;
import ohmlogger.OhmLogger;
import netz.model.ChatModel;
@@ -52,11 +50,7 @@ public class CommandConnect implements ActionListener
synchronized (this){
try {
view.getLblType().setText("Server");
ServerSocket sSocket = new ServerSocket(PORT);
lg.info("Server: Warte auf Verbindung ...");
Socket s = sSocket.accept(); // Achtung: blockiert!
lg.info("Server: Verbindung akzeptiert");
model.setSocket(s);
model.setServer(PORT);
} catch (IOException ex) {
lg.severe(ex.toString());
}
@@ -68,10 +62,8 @@ public class CommandConnect implements ActionListener
synchronized (this){
try {
view.getLblType().setText("Client");
lg.info("Client: verbinde ...");
Socket s = new Socket(IP_ADRESSE, PORT); // Achtung: blockiert!
lg.info("Client: Verbindung hergestellt");
model.setSocket(s);
model.setClient(PORT, IP_ADRESSE);
} catch (IOException ex) {
lg.severe(ex.toString());
}
src/netz/controller/ReceiveAdapter.java
+1
View File
@@ -48,6 +48,7 @@ public class ReceiveAdapter implements Flow.Subscriber<String>
{
view.getLblStatusDialog().setText("Nachricht empfangen");
view.getjTextArea().append("Partner: " + item + "\n");
subscription.request(1);
//System.out.println(item);
}
src/netz/model/ChatModel.java
+36 -2
View File
@@ -16,6 +16,7 @@ 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.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -78,8 +79,6 @@ public class ChatModel implements Runnable
}
public void setSocket(Socket s) throws IOException {
this.socket = s;
InputStream iStream = s.getInputStream();
OutputStream oStream = s.getOutputStream();
@@ -91,6 +90,41 @@ public class ChatModel implements Runnable
out = new PrintWriter(osr);
start();
}
public void setClient(int PORT, String IP_ADRESSE) throws IOException
{
Thread connectThread = new Thread(new Runnable() {
@Override
public void run() {
try {
lg.info("Client: verbinde ...");
Socket s = new Socket(IP_ADRESSE, PORT); // Achtung: blockiert!
lg.info("Client: Verbindung hergestellt");
setSocket(s);
} catch (Exception e) {
e.printStackTrace();
}
}
});
connectThread.start();
}
public void setServer(int PORT) throws IOException
{
Thread connectThread = new Thread(new Runnable() {
@Override
public void run() {
try {
ServerSocket sSocket = new ServerSocket(PORT);
lg.info("Server: Warte auf Verbindung ...");
Socket s = sSocket.accept(); // Achtung: blockiert!
lg.info("Server: Verbindung akzeptiert");
setSocket(s);
} catch (Exception e) {
e.printStackTrace();
}
}
});
connectThread.start();
}
public void sendMessage(String msg)
{
src/netz/view/ChatView.form
+29 -24
View File
@@ -37,9 +37,6 @@
</Layout>
<SubComponents>
<Component class="javax.swing.JLabel" name="lblType">
<Properties>
<Property name="text" type="java.lang.String" value="Client"/>
</Properties>
</Component>
<Component class="javax.swing.JButton" name="btnSetClient">
<Properties>
@@ -53,16 +50,6 @@
</Component>
</SubComponents>
</Container>
<Component class="javax.swing.JTextField" name="txtField">
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="txtFieldActionPerformed"/>
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="Center"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JButton" name="btnSend">
<Properties>
<Property name="text" type="java.lang.String" value="Send"/>
@@ -83,23 +70,41 @@
</Constraint>
</Constraints>
</Component>
<Container class="javax.swing.JScrollPane" name="jScrollPane1">
<AuxValues>
<AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
</AuxValues>
<Container class="javax.swing.JPanel" name="jPanel2">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="Before"/>
<BorderConstraints direction="Center"/>
</Constraint>
</Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout">
<Property name="columns" type="int" value="1"/>
<Property name="rows" type="int" value="2"/>
</Layout>
<SubComponents>
<Component class="javax.swing.JTextArea" name="jTextArea">
<Properties>
<Property name="columns" type="int" value="20"/>
<Property name="rows" type="int" value="5"/>
</Properties>
<Container class="javax.swing.JScrollPane" name="jScrollPane1">
<AuxValues>
<AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
<SubComponents>
<Component class="javax.swing.JTextArea" name="jTextArea">
<Properties>
<Property name="editable" type="boolean" value="false"/>
<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="cc" green="cc" red="cc" type="rgb"/>
</Property>
<Property name="columns" type="int" value="20"/>
<Property name="rows" type="int" value="5"/>
</Properties>
</Component>
</SubComponents>
</Container>
<Component class="javax.swing.JTextField" name="txtField">
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="txtFieldActionPerformed"/>
</Events>
</Component>
</SubComponents>
</Container>
src/netz/view/ChatView.java
+21 -15
View File
@@ -114,18 +114,17 @@ public class ChatView extends javax.swing.JFrame
lblType = new javax.swing.JLabel();
btnSetClient = new javax.swing.JButton();
btnSetServer = new javax.swing.JButton();
txtField = new javax.swing.JTextField();
btnSend = new javax.swing.JButton();
lblStatusDialog = new javax.swing.JLabel();
jPanel2 = new javax.swing.JPanel();
jScrollPane1 = new javax.swing.JScrollPane();
jTextArea = new javax.swing.JTextArea();
txtField = new javax.swing.JTextField();
setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
setTitle("ChatTool");
jPanel1.setLayout(new java.awt.GridLayout(1, 0));
lblType.setText("Client");
jPanel1.add(lblType);
btnSetClient.setText("Client");
@@ -136,6 +135,22 @@ public class ChatView extends javax.swing.JFrame
getContentPane().add(jPanel1, java.awt.BorderLayout.PAGE_START);
btnSend.setText("Send");
getContentPane().add(btnSend, java.awt.BorderLayout.LINE_END);
lblStatusDialog.setText("\"\"");
getContentPane().add(lblStatusDialog, java.awt.BorderLayout.PAGE_END);
jPanel2.setLayout(new java.awt.GridLayout(2, 1));
jTextArea.setEditable(false);
jTextArea.setBackground(new java.awt.Color(204, 204, 204));
jTextArea.setColumns(20);
jTextArea.setRows(5);
jScrollPane1.setViewportView(jTextArea);
jPanel2.add(jScrollPane1);
txtField.addActionListener(new java.awt.event.ActionListener()
{
public void actionPerformed(java.awt.event.ActionEvent evt)
@@ -143,19 +158,9 @@ public class ChatView extends javax.swing.JFrame
txtFieldActionPerformed(evt);
}
});
getContentPane().add(txtField, java.awt.BorderLayout.CENTER);
jPanel2.add(txtField);
btnSend.setText("Send");
getContentPane().add(btnSend, java.awt.BorderLayout.LINE_END);
lblStatusDialog.setText("\"\"");
getContentPane().add(lblStatusDialog, java.awt.BorderLayout.PAGE_END);
jTextArea.setColumns(20);
jTextArea.setRows(5);
jScrollPane1.setViewportView(jTextArea);
getContentPane().add(jScrollPane1, java.awt.BorderLayout.LINE_START);
getContentPane().add(jPanel2, java.awt.BorderLayout.CENTER);
pack();
}// </editor-fold>//GEN-END:initComponents
@@ -222,6 +227,7 @@ public class ChatView extends javax.swing.JFrame
private javax.swing.JButton btnSetClient;
private javax.swing.JButton btnSetServer;
private javax.swing.JPanel jPanel1;
private javax.swing.JPanel jPanel2;
private javax.swing.JScrollPane jScrollPane1;
private javax.swing.JTextArea jTextArea;
private javax.swing.JLabel lblStatusDialog;
src/ohmlogger/MyFormatter.java
-26
View File
@@ -1,26 +0,0 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package ohmlogger;
import java.util.Date;
import java.util.logging.Formatter;
import java.util.logging.LogRecord;
/**
*
* @author chris
*/
public class MyFormatter extends Formatter {
@Override
public String format(LogRecord lr) {
String date = String.format("%1$tb %1$td, %1$tY %1$tl:%1$tM:%1$tS %1$Tp", new Date(lr.getMillis()));
String s = ("| ")+lr.getMillis()+(" | ")+date+(" | ")+lr.getLevel().toString()+(" | ")+lr.getSourceClassName()+(" | ")+lr.getMessage()+(" | ")+"\n";
return s;
}
}
src/ohmlogger/OhmLogger.java
-54
View File
@@ -1,54 +0,0 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package ohmlogger;
import java.io.File;
import java.io.IOException;
import java.util.logging.*;
/**
*
* @author chris, hd
*/
public class OhmLogger
{
public OhmLogger()
{
}
private static Logger lg = null;
public static Logger getLogger()
{
if (lg == null)
{
lg = Logger.getLogger("OhmLogger");
initLogger();
}
return lg;
}
private static void initLogger()
{
try{
String datei = System.getProperty("java.io.tmpdir") + File.separator + "log.txt";
FileHandler fh = new FileHandler(datei);
fh.setFormatter(new MyFormatter());
ConsoleHandler ch = new ConsoleHandler();
lg.addHandler(fh);
ch.setFormatter(new MyFormatter());
lg.setUseParentHandlers(false);
lg.addHandler(ch);
lg.setLevel(Level.ALL);
}
catch(IOException ioex)
{
System.err.println(ioex);
}
}
}
src/ohmlogger/OhmLogger.properties
-4
View File
@@ -1,4 +0,0 @@
#Level
LOG_LEVEL=INFO
#Log-Datei
LOG_DATEI=../logOHM.txt
src/ohmlogger/logger.properties
-4
View File
@@ -1,4 +0,0 @@
#Level
LOG_LEVEL=ALL
#Log-Datei
LOG_DATEI=