diff --git a/src/mvcgrafik/controller/BtnController.java b/src/mvcgrafik/controller/BtnController.java index ebfc133..5a0b986 100644 --- a/src/mvcgrafik/controller/BtnController.java +++ b/src/mvcgrafik/controller/BtnController.java @@ -19,7 +19,7 @@ import javax.swing.JFileChooser; import mvcgrafik.model.Figure; import mvcgrafik.model.GrafikModel; import mvcgrafik.view.GrafikMenuView; -import mvcgrafik.logger.OhmLogger; +import ohmlogger.OhmLogger; /** diff --git a/src/mvcgrafik/controller/GrafikController.java b/src/mvcgrafik/controller/GrafikController.java index a7ec53f..b5d6d61 100755 --- a/src/mvcgrafik/controller/GrafikController.java +++ b/src/mvcgrafik/controller/GrafikController.java @@ -13,7 +13,7 @@ import java.awt.event.MouseMotionListener; import java.util.logging.Logger; import mvcgrafik.model.Figure; import mvcgrafik.model.GrafikModel; -import mvcgrafik.logger.OhmLogger; +import ohmlogger.OhmLogger; import mvcgrafik.view.GrafikView; diff --git a/src/mvcgrafik/logger/MyFormatter.java b/src/mvcgrafik/logger/MyFormatter.java deleted file mode 100644 index b6f49f7..0000000 --- a/src/mvcgrafik/logger/MyFormatter.java +++ /dev/null @@ -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 mvcgrafik.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/mvcgrafik/logger/OhmLogger.java b/src/mvcgrafik/logger/OhmLogger.java deleted file mode 100644 index 6b1fcd3..0000000 --- a/src/mvcgrafik/logger/OhmLogger.java +++ /dev/null @@ -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 mvcgrafik.logger; - - -import mvcgrafik.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/mvcgrafik/view/GrafikView.java b/src/mvcgrafik/view/GrafikView.java index bd68911..27c8914 100755 --- a/src/mvcgrafik/view/GrafikView.java +++ b/src/mvcgrafik/view/GrafikView.java @@ -22,7 +22,7 @@ import javax.print.attribute.standard.DialogTypeSelection; import javax.swing.JComponent; import javax.swing.JOptionPane; import mvcgrafik.model.GrafikModel; -import mvcgrafik.logger.OhmLogger; +import ohmlogger.OhmLogger; /** *