Refactored Logger into its own package with seperate enum classes.

git-svn-id: http://svn.dmdirc.com/trunk@170 00569f92-eb28-0410-84fd-f71c24880f

src/uk/org/ownage/dmdirc/logger/DebugLevel.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package uk.org.ownage.dmdirc.logger;
+
+public enum DebugLevel {        
+    NORMAL, 
+    FINE, 
+    FINER, 
+    FINEST
+}

src/uk/org/ownage/dmdirc/logger/ErrorLevel.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package uk.org.ownage.dmdirc.logger;
+
+public enum ErrorLevel {        
+    FATAL, 
+    ERROR, 
+    WARNING, 
+    INFO
+}

src/uk/org/ownage/dmdirc/logger/LogLevel.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package uk.org.ownage.dmdirc.logger;
+
+public enum LogLevel {        
+    CORE, 
+    COMMAND, 
+    PARSER, 
+    PLUGIN, 
+    UI
+}

src/uk/org/ownage/dmdirc/Logger.java → src/uk/org/ownage/dmdirc/logger/Logger.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.org.ownage.dmdirc;
+package uk.org.ownage.dmdirc.logger;
 
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
@@ -34,6 +34,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import javax.swing.JDialog;
 import javax.swing.JOptionPane;
+import uk.org.ownage.dmdirc.Config;
 import uk.org.ownage.dmdirc.ui.MainFrame;
 
 /**
@@ -42,10 +43,6 @@ import uk.org.ownage.dmdirc.ui.MainFrame;
  */
 public class Logger {
     
-    public enum errorLevel {FATAL, ERROR, WARNING, INFO}
-    public enum debugLevel {NORMAL, FINE, FINER, FINEST}
-    public enum logLevel {CORE, COMMAND, PARSER, PLUGIN, UI}
-    
     private static PrintWriter logWriter = null;
     
     private static JDialog dialog;
@@ -58,7 +55,7 @@ public class Logger {
     private Logger() {
     }
     
-    public static void error(Logger.errorLevel level, String message) {
+    public static void error(ErrorLevel level, String message) {
         if (logWriter == null ) createWriter();
         switch (level) {
             case FATAL:
@@ -93,12 +90,16 @@ public class Logger {
         }
     }
     
-    public static void error(Logger.errorLevel level, Exception message) {
+    public static void error(ErrorLevel level, Exception exception) {
         if (logWriter == null ) createWriter();
+        StackTraceElement[] stacktrace = exception.getStackTrace();
         switch (level) {
             case FATAL:
-                logWriter.println(format.format(new Date())+": ERROR: "+": "+level+" :"+message);
-                optionPane = new JOptionPane(message, JOptionPane.ERROR_MESSAGE,
+                logWriter.println(format.format(new Date())+": ERROR: "+": "+level+" :"+exception.getMessage());
+                for (StackTraceElement traceElement: stacktrace) {
+                    logWriter.println("\t\t\t\t"+traceElement);
+                }
+                optionPane = new JOptionPane(exception.getMessage(), JOptionPane.ERROR_MESSAGE,
                         JOptionPane.DEFAULT_OPTION);
                 dialog = new JDialog(MainFrame.getMainFrame(), "Fatal Error",
                         true);
@@ -123,12 +124,15 @@ public class Logger {
                 dialog.setVisible(true);
                 break;
             default:
-                logWriter.println(format.format(new Date())+": ERROR: "+": "+level+" :"+message);
+                logWriter.println(format.format(new Date())+": ERROR: "+": "+level+" :"+exception.getMessage());
+                for (StackTraceElement traceElement: stacktrace) {
+                    logWriter.println("\t\t\t\t"+traceElement);
+                }
                 break;
         }
     }
     
-    public static void debug(Logger.debugLevel level, String message) {
+    public static void debug(DebugLevel level, String message) {
         if (logWriter == null ) createWriter();
         switch(level) {
             default:
@@ -138,7 +142,7 @@ public class Logger {
         }
     }
     
-    public static void log(Logger.logLevel level, String message) {
+    public static void log(LogLevel level, String message) {
         if (logWriter == null ) createWriter();
         switch(level) {
             default:
@@ -151,7 +155,7 @@ public class Logger {
         try {
             logWriter = new PrintWriter(new BufferedWriter(new FileWriter(Config.getConfigDir()+"errors.log")));
         } catch (IOException ex) {
-            Logger.error(Logger.errorLevel.FATAL, "Oh god, i cant open the error log.");
+            Logger.error(ErrorLevel.FATAL, "Oh god, i cant open the error log.");
         }
         if (Config.hasOption("logging", "dateFormat")) {
             format = new SimpleDateFormat(Config.getOption("logging", "dateFormat"));