Merge origin/master

Conflicts:
	src/wuerfelthreads/Start.java
	src/wuerfelthreads/view/WuerfelView.form
	src/wuerfelthreads/view/WuerfelView.java

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;
 
 
 /**

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;
 
 

src/mvcgrafik/logger/MyFormatter.java

@@ -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;
-    }
-    
-}

src/mvcgrafik/logger/OhmLogger.java

@@ -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);
-    }
-  }
-}

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;
 
 /**
  *