Merge pull request #418 from greboid/dev3

SLF4J Logging in Logging plugin.

logging/src/com/dmdirc/addons/logging/HistoryWindow.java

@@ -24,10 +24,8 @@ package com.dmdirc.addons.logging;
 
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.util.io.ReverseFileReader;
@@ -43,13 +41,18 @@ import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.dmdirc.util.LogUtils.USER_ERROR;
+
 /**
  * Displays an extended history of a window.
  */
 public class HistoryWindow extends FrameContainer {
 
+    private static final Logger LOG = LoggerFactory.getLogger(HistoryWindow.class);
     private final Path logFile;
-    private final DMDircMBassador eventBus;
     private final int numLines;
 
     /**
@@ -63,10 +66,8 @@ public class HistoryWindow extends FrameContainer {
             final BackBufferFactory backBufferFactory,
             final int numLines) {
         super(parent, "raw", title, title, parent.getConfigManager(), backBufferFactory,
-                eventBus,
-                Collections.singletonList(WindowComponent.TEXTAREA.getIdentifier()));
+                eventBus, Collections.singletonList(WindowComponent.TEXTAREA.getIdentifier()));
         this.logFile = logFile;
-        this.eventBus = eventBus;
         this.numLines = numLines;
 
         initBackBuffer();
@@ -90,8 +91,7 @@ public class HistoryWindow extends FrameContainer {
                 addLine(text, date);
             });
         } catch (IOException | SecurityException ex) {
-            eventBus.publishAsync(
-                    new UserErrorEvent(ErrorLevel.MEDIUM, ex, "Unable to read log file.", ""));
+            LOG.warn(USER_ERROR, "Unable to read log file.", ex);
         }
     }
 

logging/src/com/dmdirc/addons/logging/LogFileLocator.java

@@ -23,15 +23,12 @@
 package com.dmdirc.addons.logging;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.config.ConfigBinding;
-import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.plugins.PluginDomain;
 
 import java.io.File;
@@ -47,13 +44,18 @@ import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.inject.Singleton;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.dmdirc.util.LogUtils.USER_ERROR;
+
 /**
  * Facilitates finding a path for log files.
  */
 @Singleton
 public class LogFileLocator {
 
-    private final DMDircMBassador eventBus;
+    private static final Logger LOG = LoggerFactory.getLogger(LogFileLocator.class);
     private final Provider<String> directoryProvider;
 
     /** Whether to append a hash of the file name to the file name... */
@@ -74,11 +76,9 @@ public class LogFileLocator {
 
     @Inject
     public LogFileLocator(
-            final DMDircMBassador eventBus,
             @Directory(LoggingModule.LOGS_DIRECTORY) final Provider<String> directoryProvider,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             @PluginDomain(LoggingPlugin.class) final String domain) {
-        this.eventBus = eventBus;
         this.directoryProvider = directoryProvider;
 
         globalConfig.getBinder().withDefaultDomain(domain).bind(this, LogFileLocator.class);
@@ -172,8 +172,7 @@ public class LogFileLocator {
 
             if (!new File(directory.toString()).exists()
                     && !new File(directory.toString()).mkdirs()) {
-                eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, null,
-                        "Unable to create date dirs", ""));
+                LOG.info(USER_ERROR, "Unable to create data dirs");
             }
         }
 
@@ -208,13 +207,11 @@ public class LogFileLocator {
         final File dir = new File(directory + network + System.getProperty(
                 "file.separator"));
         if (dir.exists() && !dir.isDirectory()) {
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, null,
-                    "Unable to create networkfolders dir (file exists instead)", ""));
+            LOG.info(USER_ERROR, "Unable to create networkfolders dir (file exists instead)");
             // Prepend network name to file instead.
             prependNetwork = true;
         } else if (!dir.exists() && !dir.mkdirs()) {
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, null,
-                    "Unable to create networkfolders dir", ""));
+            LOG.info(USER_ERROR, "Unable to create networkfolders dir");
             prependNetwork = true;
         }
 

logging/src/com/dmdirc/addons/logging/LoggingManager.java

@@ -48,7 +48,6 @@ import com.dmdirc.events.ChannelTopicChangeEvent;
 import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.events.QueryClosedEvent;
 import com.dmdirc.events.QueryOpenedEvent;
-import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.PrivateChat;
@@ -56,7 +55,6 @@ import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
-import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.ui.WindowManager;
@@ -89,14 +87,20 @@ import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.inject.Singleton;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import net.engio.mbassy.listener.Handler;
 
+import static com.dmdirc.util.LogUtils.USER_ERROR;
+
 /**
  * Manages logging activities.
  */
 @Singleton
 public class LoggingManager implements ConfigChangeListener {
 
+    private static final Logger LOG = LoggerFactory.getLogger(LoggingManager.class);
     /** Date format used for "File Opened At" log. */
     private static final DateFormat OPENED_AT_FORMAT = new SimpleDateFormat(
             "EEEE MMMM dd, yyyy - HH:mm:ss");
@@ -153,13 +157,11 @@ public class LoggingManager implements ConfigChangeListener {
         final File dir = new File(directoryProvider.get());
         if (dir.exists()) {
             if (!dir.isDirectory()) {
-                eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, null,
-                        "Unable to create logging dir (file exists instead)", ""));
+                LOG.info(USER_ERROR, "Unable to create logging dir (file exists instead)");
             }
         } else {
             if (!dir.mkdirs()) {
-                eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, null,
-                        "Unable to create logging dir", ""));
+                LOG.info(USER_ERROR, "Unable to create logging dir");
             }
         }
 
@@ -402,7 +404,7 @@ public class LoggingManager implements ConfigChangeListener {
      */
     protected void showBackBuffer(final WindowModel frame, final String filename) {
         if (frame == null) {
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, null, "Given a null frame", ""));
+            LOG.info(USER_ERROR, "Unable to show back buffer, frame was null");
             return;
         }
 
@@ -421,9 +423,8 @@ public class LoggingManager implements ConfigChangeListener {
                 file.close();
                 frame.addLine(getColouredString(colour, "--- End of backbuffer\n"));
             } catch (IOException | SecurityException e) {
-                eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, e,
-                        "Unable to show backbuffer (Filename: " + filename + "): " + e.getMessage(),
-                        ""));
+                LOG.info(USER_ERROR, "Unable to show backbuffer (Filename: {}): {}", filename,
+                        e.getMessage(), e);
             }
         }
     }