diff --git a/src/netz/Start.java b/src/chatProg/Start.java similarity index 84% rename from src/netz/Start.java rename to src/chatProg/Start.java index 1cd292e..2335b4e 100755 --- a/src/netz/Start.java +++ b/src/chatProg/Start.java @@ -4,19 +4,19 @@ * and open the template in the editor. */ -package netz; +package chatProg; import javax.swing.JFrame; import javax.swing.WindowConstants; -import netz.controller.ReceiveAdapter; -import netz.controller.CommandConnect; -import netz.controller.CommandSend; -import netz.model.ChatModel; -import netz.view.ChatView; +import chatProg.controller.ReceiveAdapter; +import chatProg.controller.CommandConnect; +import chatProg.controller.CommandSend; +import chatProg.model.ChatModel; +import chatProg.view.ChatView; import java.util.logging.Logger; import javax.swing.JOptionPane; import javax.swing.UIManager; -import ohmlogger.OhmLogger; +import chatProg.logger.OhmLogger; /** diff --git a/src/netz/controller/CommandConnect.java b/src/chatProg/controller/CommandConnect.java similarity index 92% rename from src/netz/controller/CommandConnect.java rename to src/chatProg/controller/CommandConnect.java index 15bfa31..c77d28a 100644 --- a/src/netz/controller/CommandConnect.java +++ b/src/chatProg/controller/CommandConnect.java @@ -4,15 +4,15 @@ * and open the template in the editor. */ -package netz.controller; +package chatProg.controller; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.IOException; import java.util.logging.Logger; -import ohmlogger.OhmLogger; -import netz.model.ChatModel; -import netz.view.ChatView; +import chatProg.logger.OhmLogger; +import chatProg.model.ChatModel; +import chatProg.view.ChatView; /** * diff --git a/src/netz/controller/CommandSend.java b/src/chatProg/controller/CommandSend.java similarity index 89% rename from src/netz/controller/CommandSend.java rename to src/chatProg/controller/CommandSend.java index 86b29d7..755ac5c 100644 --- a/src/netz/controller/CommandSend.java +++ b/src/chatProg/controller/CommandSend.java @@ -4,14 +4,14 @@ * and open the template in the editor. */ -package netz.controller; +package chatProg.controller; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.logging.Logger; -import ohmlogger.OhmLogger; -import netz.model.ChatModel; -import netz.view.ChatView; +import chatProg.logger.OhmLogger; +import chatProg.model.ChatModel; +import chatProg.view.ChatView; /** * diff --git a/src/netz/controller/ReceiveAdapter.java b/src/chatProg/controller/ReceiveAdapter.java similarity index 90% rename from src/netz/controller/ReceiveAdapter.java rename to src/chatProg/controller/ReceiveAdapter.java index 69f7c32..38f39f1 100644 --- a/src/netz/controller/ReceiveAdapter.java +++ b/src/chatProg/controller/ReceiveAdapter.java @@ -4,13 +4,13 @@ * and open the template in the editor. */ -package netz.controller; +package chatProg.controller; import java.util.concurrent.Flow; import java.util.logging.Logger; -import ohmlogger.OhmLogger; -import netz.model.ChatModel; -import netz.view.ChatView; +import chatProg.logger.OhmLogger; +import chatProg.model.ChatModel; +import chatProg.view.ChatView; /** * diff --git a/src/chatProg/logger/MyFormatter.java b/src/chatProg/logger/MyFormatter.java new file mode 100644 index 0000000..2ffb80b --- /dev/null +++ b/src/chatProg/logger/MyFormatter.java @@ -0,0 +1,26 @@ +/* + * 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 chatProg.logger; + +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; + } + +} \ No newline at end of file diff --git a/src/chatProg/logger/OhmLogger.java b/src/chatProg/logger/OhmLogger.java new file mode 100644 index 0000000..a3e4e13 --- /dev/null +++ b/src/chatProg/logger/OhmLogger.java @@ -0,0 +1,54 @@ +/* + * 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 chatProg.logger; + + +import chatProg.logger.MyFormatter; +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); + 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); + } + } +} diff --git a/src/netz/model/ChatModel.java b/src/chatProg/model/ChatModel.java similarity index 98% rename from src/netz/model/ChatModel.java rename to src/chatProg/model/ChatModel.java index 7fd898c..a5dd9a1 100644 --- a/src/netz/model/ChatModel.java +++ b/src/chatProg/model/ChatModel.java @@ -4,10 +4,10 @@ * and open the template in the editor. */ -package netz.model; +package chatProg.model; -import ohmlogger.OhmLogger; +import chatProg.logger.OhmLogger; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/netz/view/ChatView.form b/src/chatProg/view/ChatView.form similarity index 100% rename from src/netz/view/ChatView.form rename to src/chatProg/view/ChatView.form diff --git a/src/netz/view/ChatView.java b/src/chatProg/view/ChatView.java similarity index 99% rename from src/netz/view/ChatView.java rename to src/chatProg/view/ChatView.java index f9c9301..a9fb8b5 100644 --- a/src/netz/view/ChatView.java +++ b/src/chatProg/view/ChatView.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package netz.view; +package chatProg.view; /** *