Conflicts: src/wuerfelthreads/Start.java src/wuerfelthreads/view/WuerfelView.form src/wuerfelthreads/view/WuerfelView.javamaster
@@ -15,7 +15,7 @@ import javax.swing.WindowConstants; | |||
import netz.controller.BtnController; | |||
import netz.controller.ChatController; | |||
import netz.model.ChatModel; | |||
import netz.view.ChatView; | |||
import netz.view2.ChatView; | |||
/** | |||
* Builder Class |
@@ -10,7 +10,7 @@ import java.awt.event.ActionEvent; | |||
import java.awt.event.ActionListener; | |||
import java.util.logging.Logger; | |||
import netz.model.ChatModel; | |||
import netz.view.ChatView; | |||
import netz.view2.ChatView; | |||
import ohmlogger.OhmLogger; | |||
/** |
@@ -10,7 +10,7 @@ import java.awt.event.ActionEvent; | |||
import java.awt.event.ActionListener; | |||
import java.util.logging.Logger; | |||
import netz.model.ChatModel; | |||
import netz.view.ChatView; | |||
import netz.view2.ChatView; | |||
import ohmlogger.OhmLogger; | |||
/** |
@@ -3,9 +3,7 @@ | |||
* To change this template file, choose Tools | Templates | |||
* and open the template in the editor. | |||
*/ | |||
package netz.view; | |||
import netz.view.*; | |||
package netz.view2; | |||
/** | |||
* |