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-09 11:55:54 +01:00
parent af863d9514
commit 9db2d425c1
5 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/netz/Start.java
View File

@ -15,7 +15,7 @@ import javax.swing.WindowConstants;
import netz.controller.BtnController; import netz.controller.BtnController;
import netz.controller.ChatController; import netz.controller.ChatController;
import netz.model.ChatModel; import netz.model.ChatModel;
import netz.view.ChatView; import netz.view2.ChatView;
/** /**
* Builder Class * Builder Class

2
src/netz/controller/BtnController.java
View File

@ -10,7 +10,7 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.util.logging.Logger; import java.util.logging.Logger;
import netz.model.ChatModel; import netz.model.ChatModel;
import netz.view.ChatView; import netz.view2.ChatView;
import ohmlogger.OhmLogger; import ohmlogger.OhmLogger;
/** /**

2
src/netz/controller/ChatController.java
View File

@ -10,7 +10,7 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.util.logging.Logger; import java.util.logging.Logger;
import netz.model.ChatModel; import netz.model.ChatModel;
import netz.view.ChatView; import netz.view2.ChatView;
import ohmlogger.OhmLogger; import ohmlogger.OhmLogger;
/** /**

0
src/netz/view/ChatView.form → src/netz/view2/ChatView.form
View File

4
src/netz/view/ChatView.java → src/netz/view2/ChatView.java
View File

@ -3,9 +3,7 @@
* To change this template file, choose Tools | Templates * To change this template file, choose Tools | Templates
* and open the template in the editor. * and open the template in the editor.
*/ */
package netz.view; package netz.view2;
import netz.view.*;
/** /**
* *