From 368575442f5d61ea844d2ff42b5a25a2555abc00 Mon Sep 17 00:00:00 2001
From: BakeOrDie <chris.feichtenbeiner@t-online.de>
Date: Wed, 9 Dec 2020 11:41:58 +0100
Subject: [PATCH] Merge origin/master

Conflicts:
	src/wuerfelthreads/Start.java
	src/wuerfelthreads/view/WuerfelView.form
	src/wuerfelthreads/view/WuerfelView.java
---
 src/netz/{view => view2}/ChatView.form | 0
 src/netz/{view => view2}/ChatView.java | 8 ++++++--
 src/ohmlogger/OhmLogger.properties     | 4 ++++
 src/ohmlogger/logger.properties        | 4 ++++
 4 files changed, 14 insertions(+), 2 deletions(-)
 rename src/netz/{view => view2}/ChatView.form (100%)
 rename src/netz/{view => view2}/ChatView.java (97%)
 create mode 100644 src/ohmlogger/OhmLogger.properties
 create mode 100644 src/ohmlogger/logger.properties

diff --git a/src/netz/view/ChatView.form b/src/netz/view2/ChatView.form
similarity index 100%
rename from src/netz/view/ChatView.form
rename to src/netz/view2/ChatView.form
diff --git a/src/netz/view/ChatView.java b/src/netz/view2/ChatView.java
similarity index 97%
rename from src/netz/view/ChatView.java
rename to src/netz/view2/ChatView.java
index 1485b33..a179139 100644
--- a/src/netz/view/ChatView.java
+++ b/src/netz/view2/ChatView.java
@@ -3,7 +3,9 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package netz.view;
+package netz.view2;
+
+import netz.view.*;
 
 /**
  *
@@ -113,7 +115,7 @@ public class ChatView extends javax.swing.JFrame
     setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
     setTitle("ChatTool");
 
-    jPanel1.setLayout(new java.awt.GridLayout());
+    jPanel1.setLayout(new java.awt.GridLayout(1, 0));
 
     lblType.setText("Client");
     jPanel1.add(lblType);
@@ -177,6 +179,8 @@ public class ChatView extends javax.swing.JFrame
     }
     //</editor-fold>
     //</editor-fold>
+    //</editor-fold>
+    //</editor-fold>
 
     /* Create and display the form */
     java.awt.EventQueue.invokeLater(new Runnable()
diff --git a/src/ohmlogger/OhmLogger.properties b/src/ohmlogger/OhmLogger.properties
new file mode 100644
index 0000000..44a9c20
--- /dev/null
+++ b/src/ohmlogger/OhmLogger.properties
@@ -0,0 +1,4 @@
+#Level
+LOG_LEVEL=INFO
+#Log-Datei
+LOG_DATEI=../logOHM.txt
\ No newline at end of file
diff --git a/src/ohmlogger/logger.properties b/src/ohmlogger/logger.properties
new file mode 100644
index 0000000..82e49d2
--- /dev/null
+++ b/src/ohmlogger/logger.properties
@@ -0,0 +1,4 @@
+#Level
+LOG_LEVEL=ALL
+#Log-Datei
+LOG_DATEI=
\ No newline at end of file