EventBus logging for URLBuilder.

Change-Id: If1f98b4007a50f66c2dcd6f0a7744d24b2139555
Reviewed-on: http://gerrit.dmdirc.com/3673
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/util/URLBuilder.java

@@ -22,11 +22,13 @@
 
 package com.dmdirc.util;
 
+import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.themes.ThemeManager;
 
+import com.google.common.eventbus.EventBus;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 
@@ -44,19 +46,24 @@ public class URLBuilder {
     private final Provider<PluginManager> pluginManagerProvider;
     /** Provider to retrieve a theme manager instance when needed. */
     private final Provider<ThemeManager> themeManagerProvider;
+    /** The event bus to post errors on. */
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of URLBuilder.
      *
      * @param pluginManagerProvider Provider to retrieve a plugin manager instance when needed.
      * @param themeManagerProvider  Provider to retrieve a theme manager instance when needed.
+     * @param eventBus              The event bus to post errors on.
      */
     @Inject
     public URLBuilder(
             final Provider<PluginManager> pluginManagerProvider,
-            final Provider<ThemeManager> themeManagerProvider) {
+            final Provider<ThemeManager> themeManagerProvider,
+            final EventBus eventBus) {
         this.pluginManagerProvider = pluginManagerProvider;
         this.themeManagerProvider = themeManagerProvider;
+        this.eventBus = eventBus;
     }
 
     /**
@@ -72,7 +79,7 @@ public class URLBuilder {
         try {
             return new URL(prefix + path);
         } catch (MalformedURLException ex) {
-            Logger.appError(ErrorLevel.HIGH, "Unable to build file URL", ex);
+            eventBus.post(new UserErrorEvent(ErrorLevel.HIGH, ex, "Unable to build file URL", ""));
             return null;
         }
     }
@@ -93,7 +100,7 @@ public class URLBuilder {
             }
             return new URL(url);
         } catch (MalformedURLException ex) {
-            Logger.appError(ErrorLevel.HIGH, "Unable to build jar URL", ex);
+            eventBus.post(new UserErrorEvent(ErrorLevel.HIGH, ex, "Unable to build jar URL", ""));
             return null;
         }
     }
@@ -158,7 +165,8 @@ public class URLBuilder {
             final int offset = spec.indexOf(':', 6);
 
             if (offset < 0) {
-                Logger.userError(ErrorLevel.LOW, "Invalid URL, must contain ':': " + spec);
+                eventBus.post(new UserErrorEvent(ErrorLevel.LOW, null,
+                        "Invalid URL, must contain ':': " + spec, ""));
                 return null;
             } else {
                 return getUrlForJarFile(spec.substring(6, offset), spec.substring(offset + 1));
@@ -167,7 +175,8 @@ public class URLBuilder {
             final int offset = spec.indexOf(':', 8);
 
             if (offset < 0) {
-                Logger.userError(ErrorLevel.LOW, "Invalid URL, must contain ':': " + spec);
+                eventBus.post(new UserErrorEvent(ErrorLevel.LOW, null,
+                        "Invalid URL, must contain ':': " + spec, ""));
                 return null;
             } else {
                 return getUrlForPluginResource(spec.substring(9, offset), spec.substring(offset + 1));
@@ -176,7 +185,8 @@ public class URLBuilder {
             final int offset = spec.indexOf(':', 8);
 
             if (offset < 0) {
-                Logger.userError(ErrorLevel.LOW, "Invalid URL, must contain ':': " + spec);
+                eventBus.post(new UserErrorEvent(ErrorLevel.LOW, null,
+                        "Invalid URL, must contain ':': " + spec, ""));
                 return null;
             } else {
                 return getUrlForThemeResource(spec.substring(8, offset), spec.substring(offset + 1));
@@ -185,7 +195,8 @@ public class URLBuilder {
             try {
                 return new URL(spec);
             } catch (MalformedURLException ex) {
-                Logger.userError(ErrorLevel.MEDIUM, "Unable to load resource", ex);
+                eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex,
+                        "Unable to load resource", ""));
                 return null;
             }
         } else {

test/com/dmdirc/util/URLBuilderTest.java

@@ -27,6 +27,8 @@ import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.PluginMetaData;
 import com.dmdirc.ui.themes.ThemeManager;
 
+import com.google.common.eventbus.EventBus;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 
@@ -51,6 +53,7 @@ public class URLBuilderTest {
     @Mock private ThemeManager themeManager;
     @Mock private PluginInfo pluginInfo;
     @Mock private PluginMetaData pluginMetaData;
+    @Mock private EventBus eventBus;
 
     @Before
     public void setup() throws MalformedURLException {
@@ -64,43 +67,50 @@ public class URLBuilderTest {
 
     @Test
     public void testGetUrlForFileWithoutFilePrefix() throws MalformedURLException {
-        URLBuilder urlBuilder = new URLBuilder(pluginManagerProvider, themeManagerProvider);
+        URLBuilder urlBuilder
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertEquals(new URL("file://test"), urlBuilder.getUrlForFile("test"));
     }
 
     @Test
     public void testGetUrlForFileWithFilePrefix() throws MalformedURLException {
-        URLBuilder urlBuilder = new URLBuilder(pluginManagerProvider, themeManagerProvider);
+        URLBuilder urlBuilder
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertEquals(new URL("file://test"), urlBuilder.getUrlForFile("file://test"));
     }
 
     @Test
     public void testGetUrlInvalid() throws MalformedURLException {
-        URLBuilder urlBuilder = new URLBuilder(pluginManagerProvider, themeManagerProvider);
+        URLBuilder urlBuilder
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertNull(urlBuilder.getUrlForFile("file://[test"));
     }
 
     @Test
     public void testGetUrlForJarFile() throws MalformedURLException {
-        URLBuilder urlBuilder = new URLBuilder(pluginManagerProvider, themeManagerProvider);
+        URLBuilder urlBuilder
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertEquals(new URL("jar:file:/jarFile!/test"), urlBuilder.getUrlForJarFile("jarFile", "test"));
     }
 
     @Test
     public void testGetUrlForJarFileInvalud() throws MalformedURLException {
-        URLBuilder urlBuilder = new URLBuilder(pluginManagerProvider, themeManagerProvider);
+        URLBuilder urlBuilder
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertNull(urlBuilder.getUrlForJarFile("[jarFile", "test"));
     }
 
     @Test
     public void testGetUrlForDMDircResourceNonExistant() {
-        URLBuilder urlBuilder = new URLBuilder(pluginManagerProvider, themeManagerProvider);
+        URLBuilder urlBuilder
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertNull(urlBuilder.getUrlForDMDircResource("test"));
     }
 
     @Test
     public void testGetUrlForDMDircResource() throws MalformedURLException {
-        URLBuilder urlBuilder = new URLBuilder(pluginManagerProvider, themeManagerProvider);
+        URLBuilder urlBuilder
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         URL url = urlBuilder.getUrlForDMDircResource("com/dmdirc/Main.class");
         Assert.assertEquals("file", url.getProtocol());
         Assert.assertTrue(url.getFile().endsWith("com/dmdirc/Main.class"));
@@ -108,19 +118,22 @@ public class URLBuilderTest {
 
     @Test
     public void testGetUrlForThemeResource() throws MalformedURLException {
-        URLBuilder urlBuilder = new URLBuilder(pluginManagerProvider, themeManagerProvider);
+        URLBuilder urlBuilder
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertEquals(new URL("jar:file:/themes/testTheme.zip!/testFile"), urlBuilder.getUrlForThemeResource("testTheme", "testFile"));
     }
 
     @Test
     public void testGetUrlForPluginResource() throws MalformedURLException {
-        URLBuilder urlBuilder = new URLBuilder(pluginManagerProvider, themeManagerProvider);
+        URLBuilder urlBuilder
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertEquals(new URL("jar:file:/testPlugin!/testFile"), urlBuilder.getUrlForPluginResource("testPlugin", "testFile"));
     }
 
     @Test
     public void testGetUrlDMDirc() {
-        URLBuilder urlBuilder = new URLBuilder(pluginManagerProvider, themeManagerProvider);
+        URLBuilder urlBuilder
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         URL url = urlBuilder.getUrl("dmdirc://com/dmdirc/Main.class");
         Assert.assertEquals("file", url.getProtocol());
         Assert.assertTrue(url.getFile().endsWith("com/dmdirc/Main.class"));
@@ -128,73 +141,85 @@ public class URLBuilderTest {
 
     @Test
     public void testGetUrlJar() throws MalformedURLException {
-        URLBuilder urlBuilder = new URLBuilder(pluginManagerProvider, themeManagerProvider);
+        URLBuilder urlBuilder
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertEquals(new URL("jar:file:/jarFile!/testFile"), urlBuilder.getUrl("jar://jarFile:testFile"));
     }
 
     @Test
     public void testGetUrlJarWithoutFile() throws MalformedURLException {
-        URLBuilder urlBuilder = new URLBuilder(pluginManagerProvider, themeManagerProvider);
+        URLBuilder urlBuilder
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertNull(urlBuilder.getUrl("jar://jarFile"));
     }
 
     @Test
     public void testGetUrlZip() throws MalformedURLException {
-        URLBuilder urlBuilder = new URLBuilder(pluginManagerProvider, themeManagerProvider);
+        URLBuilder urlBuilder
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertEquals(new URL("jar:file:/zipFile!/testFile"), urlBuilder.getUrl("zip://zipFile:testFile"));
     }
 
     @Test
     public void testGetUrlZipWithoutFile() throws MalformedURLException {
-        URLBuilder urlBuilder = new URLBuilder(pluginManagerProvider, themeManagerProvider);
+        URLBuilder urlBuilder
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertNull(urlBuilder.getUrl("zip://zipFile"));
     }
 
     @Test
     public void testGetUrlPlugin() throws MalformedURLException {
-        URLBuilder urlBuilder = new URLBuilder(pluginManagerProvider, themeManagerProvider);
+        URLBuilder urlBuilder
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertEquals(new URL("jar:file:/testPlugin!/testFile"), urlBuilder.getUrl("plugin://pluginFile:testFile"));
     }
 
     @Test
     public void testGetUrlPluginWithoutFile() throws MalformedURLException {
-        URLBuilder urlBuilder = new URLBuilder(pluginManagerProvider, themeManagerProvider);
+        URLBuilder urlBuilder
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertNull(urlBuilder.getUrl("plugin://pluginFile"));
     }
 
     @Test
     public void testGetUrlTheme() throws MalformedURLException {
-        URLBuilder urlBuilder = new URLBuilder(pluginManagerProvider, themeManagerProvider);
+        URLBuilder urlBuilder
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertEquals(new URL("jar:file:/themes/themeFile.zip!/testFile"), urlBuilder.getUrl("theme://themeFile:testFile"));
     }
 
     @Test
     public void testGetUrlThemeWithoutFile() throws MalformedURLException {
-        URLBuilder urlBuilder = new URLBuilder(pluginManagerProvider, themeManagerProvider);
+        URLBuilder urlBuilder
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertNull(urlBuilder.getUrl("theme://themeFile"));
     }
 
     @Test
     public void testGetUrlHTTP() throws MalformedURLException {
-        URLBuilder urlBuilder = new URLBuilder(pluginManagerProvider, themeManagerProvider);
+        URLBuilder urlBuilder
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertEquals(new URL("http://testDomain"), urlBuilder.getUrl("http://testDomain"));
     }
 
     @Test
     public void testGetUrlHTTPInvalid() throws MalformedURLException {
-        URLBuilder urlBuilder = new URLBuilder(pluginManagerProvider, themeManagerProvider);
+        URLBuilder urlBuilder
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertNull(urlBuilder.getUrl("http://[testDomain"));
     }
 
     @Test
     public void testGetUrlFileWithPrefix() throws MalformedURLException {
-        URLBuilder urlBuilder = new URLBuilder(pluginManagerProvider, themeManagerProvider);
+        URLBuilder urlBuilder
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertEquals(new URL("file://testFile"), urlBuilder.getUrl("file://testFile"));
     }
 
     @Test
     public void testGetUrlFileWithoutPrefix() throws MalformedURLException {
-        URLBuilder urlBuilder = new URLBuilder(pluginManagerProvider, themeManagerProvider);
+        URLBuilder urlBuilder
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
         Assert.assertEquals(new URL("file://testFile"), urlBuilder.getUrl("testFile"));
     }
 }