2 files changed, 71 insertions, 4 deletions
diff --git a/src/main/java/org/uic/barcode/logger/Logger.java b/src/main/java/org/uic/barcode/logger/Logger.java
index b536154..baae70d 100644
--- a/src/main/java/org/uic/barcode/logger/Logger.java
+++ b/src/main/java/org/uic/barcode/logger/Logger.java
@@ -3,11 +3,23 @@ package org.uic.barcode.logger;
 import java.util.logging.Level;
 
 
-public class Logger  {
+public class Logger {
+	
+	private boolean consoleLog = false;
+	
+	public Logger(boolean consoleLog) {
+		this.consoleLog = consoleLog;
+	}
+	
+	public Logger() {
+		this.consoleLog = false;
+	}
 	
 	public void debug(String text){	
 		java.util.logging.Logger.getGlobal().log(Level.FINEST,text);
-		System.out.println(text);
+		if (consoleLog) {
+			System.out.println(text);
+		}
 	}
 		
 	public void log(Level level,String text){	
@@ -17,6 +29,10 @@ public class Logger  {
 	public void info(String text, IllegalArgumentException e) {
 		java.util.logging.Logger.getGlobal().log(Level.INFO,text);
 	}
+	
+	public void activateConsoleLog(boolean consoleLogActive) {
+		this.consoleLog = consoleLogActive;
+	}
 
 
 }
diff --git a/src/main/java/org/uic/barcode/logger/LoggerFactory.java b/src/main/java/org/uic/barcode/logger/LoggerFactory.java
index 0a1a83c..be5736e 100644
--- a/src/main/java/org/uic/barcode/logger/LoggerFactory.java
+++ b/src/main/java/org/uic/barcode/logger/LoggerFactory.java
@@ -1,9 +1,60 @@
 package org.uic.barcode.logger;
 
+import java.util.HashMap;
+
+/**
+ * A factory for creating Logger objects. This allows to replace the default logger by your own loggers.
+ */
 public class LoggerFactory {
 	
+	
+	/** The registered loggers. */
+	private static HashMap<String,Logger> registeredLoggers = new HashMap<String,Logger>(); 
+	
+	/** The activate console log. */
+	public static boolean activateConsoleLog = false;
+	
+	/**
+	 * Gets the logger.
+	 *
+	 * @param name the name of the logger. UperEncoder uses asnLogger
+	 * @return the logger
+	 */
 	public static Logger getLogger(String name) {
-		return new Logger();
-	}	
+		Logger logger = registeredLoggers.get(name);
+		if (logger == null) {
+			logger = new Logger(activateConsoleLog);
+			registeredLoggers.put(name, logger);
+		}
+		return logger;
+	}
 
+	/**
+	 * Checks if console log is on.
+	 *
+	 * @return true, if console log is on
+	 */
+	public static boolean isActivateConsoleLog() {
+		return activateConsoleLog;
+	}
+
+	/**
+	 * Sets the console log on
+	 *
+	 * @param activateConsoleLog the new activate console log
+	 */
+	public static void setActivateConsoleLog(boolean activateConsoleLog) {
+		LoggerFactory.activateConsoleLog = activateConsoleLog;
+	}	
+	
+	/**
+	 * Register logger.
+	 *
+	 * @param name the name of the logger
+	 * @param logger the logger to be registered
+	 */
+	public void registerLogger(String name, Logger logger) {
+		registeredLoggers.put(name, logger);
+	}
+	
 }