Fixed regressions from Logger refactoring

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

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

@@ -59,7 +59,7 @@ public class Logger {
         if (logWriter == null ) createWriter();
         switch (level) {
             case FATAL:
-                logWriter.println(format.format(new Date())+": ERROR: "+": "+level+" :"+message);
+                logWriter.println(format.format(new Date())+": ERROR: "+level+" :"+message);
                 optionPane = new JOptionPane(message, JOptionPane.ERROR_MESSAGE,
                         JOptionPane.DEFAULT_OPTION);
                 dialog = new JDialog(MainFrame.getMainFrame(), "Fatal Error",
@@ -85,7 +85,7 @@ 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+" :"+message);
                 break;
         }
     }
@@ -95,7 +95,7 @@ public class Logger {
         StackTraceElement[] stacktrace = exception.getStackTrace();
         switch (level) {
             case FATAL:
-                logWriter.println(format.format(new Date())+": ERROR: "+": "+level+" :"+exception.getMessage());
+                logWriter.println(format.format(new Date())+": ERROR: "+level+" :"+exception.getMessage());
                 for (StackTraceElement traceElement: stacktrace) {
                     logWriter.println("\t\t\t\t"+traceElement);
                 }
@@ -124,7 +124,7 @@ public class Logger {
                 dialog.setVisible(true);
                 break;
             default:
-                logWriter.println(format.format(new Date())+": ERROR: "+": "+level+" :"+exception.getMessage());
+                logWriter.println(format.format(new Date())+": ERROR: "+level+" :"+exception.getMessage());
                 for (StackTraceElement traceElement: stacktrace) {
                     logWriter.println("\t\t\t\t"+traceElement);
                 }
@@ -136,8 +136,8 @@ public class Logger {
         if (logWriter == null ) createWriter();
         switch(level) {
             default:
-                System.out.println(format.format(new Date())+": DEBUG: "+": "+level+" :"+message);
-                logWriter.println(format.format(new Date())+": DEBUG: "+": "+level+" :"+message);
+                System.out.println(format.format(new Date())+": DEBUG: "+level+" :"+message);
+                logWriter.println(format.format(new Date())+": DEBUG: "+level+" :"+message);
                 break;
         }
     }
@@ -146,7 +146,7 @@ public class Logger {
         if (logWriter == null ) createWriter();
         switch(level) {
             default:
-                logWriter.println(format.format(new Date())+": LOG: "+": "+level+" :"+message);
+                logWriter.println(format.format(new Date())+": LOG: "+level+" :"+message);
                 break;
         }
     }

src/uk/org/ownage/dmdirc/ui/ChannelFrame.java

@@ -28,7 +28,6 @@ import java.awt.event.ActionListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
-import javax.swing.JComponent;
 import javax.swing.JScrollBar;
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
@@ -36,8 +35,9 @@ import javax.swing.plaf.basic.BasicInternalFrameUI;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.StyledDocument;
 import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.Logger;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
+import uk.org.ownage.dmdirc.logger.ErrorLevel;
+import uk.org.ownage.dmdirc.logger.Logger;
 import uk.org.ownage.dmdirc.parser.ChannelClientInfo;
 
 /**
@@ -84,7 +84,7 @@ public class ChannelFrame extends javax.swing.JInternalFrame implements CommandW
                 try {
                     ChannelFrame.this.parent.sendLine(jTextField1.getText());
                 } catch (Exception e) {
-                    Logger.error(Logger.errorLevel.ERROR, e);
+                    Logger.error(ErrorLevel.ERROR, e);
                 }
                 jTextField1.setText("");
             }

src/uk/org/ownage/dmdirc/ui/ServerFrame.java

@@ -27,17 +27,18 @@ import javax.swing.JScrollBar;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.StyledDocument;
 import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.Logger;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import javax.swing.JComponent;
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
 import javax.swing.plaf.basic.BasicInternalFrameUI;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.commandparser.ServerCommandParser;
+import uk.org.ownage.dmdirc.logger.DebugLevel;
+import uk.org.ownage.dmdirc.logger.ErrorLevel;
+import uk.org.ownage.dmdirc.logger.Logger;
 
 /**
  * The ServerFrame is the MDI window that shows server messages to the user
@@ -89,7 +90,7 @@ public class ServerFrame extends javax.swing.JInternalFrame implements CommandWi
                 try {
                     ServerFrame.this.commandParser.parseCommand(ServerFrame.this, jTextField1.getText());
                 } catch (Exception e) {
-                    Logger.error(Logger.errorLevel.ERROR, e);
+                    Logger.error(ErrorLevel.ERROR, e);
                 }
                 jTextField1.setText("");
             }