Merge pull request #585 from csmith/master

Remove some more AppErrorEvents.

src/com/dmdirc/config/ConfigBinder.java

@@ -22,12 +22,9 @@
 
 package com.dmdirc.config;
 
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.events.AppErrorEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
-import com.dmdirc.logger.ErrorLevel;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
@@ -43,31 +40,33 @@ import java.util.Optional;
 
 import javax.annotation.Nonnull;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.dmdirc.util.LogUtils.APP_ERROR;
+
 /**
  * Facilitates automatically binding fields or methods annotated with a {@link ConfigBinding}
  * element to a configuration value.
  */
 public class ConfigBinder {
 
+    private static final Logger LOG = LoggerFactory.getLogger(ConfigBinder.class);
+
     /** A map of instances to created listeners. */
     private final Multimap<Object, ConfigChangeListener> listeners = ArrayListMultimap.create();
     /** The default domain to use. */
     private final Optional<String> defaultDomain;
     /** The configuration manager to use to retrieve settings. */
     private final AggregateConfigProvider manager;
-    /** The event but used to raise error events. */
-    private final DMDircMBassador eventBus;
 
-    ConfigBinder(final AggregateConfigProvider manager, final DMDircMBassador eventBus) {
+    ConfigBinder(final AggregateConfigProvider manager) {
         this.manager = manager;
-        this.eventBus = eventBus;
         this.defaultDomain = Optional.empty();
     }
 
-    ConfigBinder(final AggregateConfigProvider manager, final DMDircMBassador eventBus,
-            @Nonnull final String domain) {
+    ConfigBinder(final AggregateConfigProvider manager, @Nonnull final String domain) {
         this.manager = manager;
-        this.eventBus = eventBus;
         this.defaultDomain = Optional.of(domain);
     }
 
@@ -148,8 +147,7 @@ public class ConfigBinder {
         try {
             binding.invocation().newInstance().invoke(element, instance, value);
         } catch (ReflectiveOperationException ex) {
-            eventBus.publish(new AppErrorEvent(ErrorLevel.HIGH, ex,
-                    "Exception when updating bound setting", ""));
+            LOG.error(APP_ERROR, "Exception when updating bound setting", ex);
         }
     }
 
@@ -219,7 +217,7 @@ public class ConfigBinder {
      * @param newListeners The listeners to be added
      */
     private void addListeners(final Object instance,
-            final Collection<ConfigChangeListener> newListeners) {
+            final Iterable<ConfigChangeListener> newListeners) {
         synchronized (listeners) {
             listeners.putAll(instance, newListeners);
         }
@@ -244,7 +242,7 @@ public class ConfigBinder {
      * @return A config binder with the specified default domain.
      */
     public ConfigBinder withDefaultDomain(@Nonnull final String domain) {
-        return new ConfigBinder(manager, eventBus, domain);
+        return new ConfigBinder(manager, domain);
     }
 
 }

src/com/dmdirc/config/ConfigFileBackedConfigProvider.java

@@ -22,11 +22,8 @@
 
 package com.dmdirc.config;
 
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.ConfigProvider;
-import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.util.io.ConfigFile;
 import com.dmdirc.util.io.InvalidConfigFileException;
 import com.dmdirc.util.validators.Validator;
@@ -50,6 +47,8 @@ import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static com.dmdirc.util.LogUtils.USER_ERROR;
+
 /**
  * Provides configuration settings from a {@link ConfigFile}.
  */
@@ -72,8 +71,6 @@ public class ConfigFileBackedConfigProvider implements ConfigProvider {
     /** The config change listeners for this source. */
     protected final List<WeakReference<ConfigChangeListener>> listeners =
             new CopyOnWriteArrayList<>();
-    /** The event bus to post error events to. */
-    private final DMDircMBassador eventBus;
     /** Whether this identity needs to be saved. */
     protected boolean needSave;
 
@@ -87,13 +84,12 @@ public class ConfigFileBackedConfigProvider implements ConfigProvider {
      * @throws InvalidIdentityFileException Missing required properties
      * @throws IOException                  Input/output exception
      */
-    public ConfigFileBackedConfigProvider(@Nullable final IdentityManager identityManager,
-            final DMDircMBassador eventBus, final Path file, final boolean forceDefault)
-            throws IOException, InvalidIdentityFileException {
+    public ConfigFileBackedConfigProvider(
+            @Nullable final IdentityManager identityManager, final Path file,
+            final boolean forceDefault) throws IOException, InvalidIdentityFileException {
         this.identityManager = identityManager;
         this.file = new ConfigFile(file);
         this.file.setAutomake(true);
-        this.eventBus = eventBus;
         initFile(forceDefault);
         myTarget = getTarget(forceDefault);
     }
@@ -107,12 +103,11 @@ public class ConfigFileBackedConfigProvider implements ConfigProvider {
      * @throws InvalidIdentityFileException Missing required properties
      * @throws IOException                  Input/output exception
      */
-    public ConfigFileBackedConfigProvider(final DMDircMBassador eventBus, final InputStream stream,
+    public ConfigFileBackedConfigProvider(final InputStream stream,
             final boolean forceDefault) throws IOException, InvalidIdentityFileException {
         this.identityManager = null;
         this.file = new ConfigFile(stream);
         this.file.setAutomake(true);
-        this.eventBus = eventBus;
         initFile(forceDefault);
         myTarget = getTarget(forceDefault);
     }
@@ -125,11 +120,9 @@ public class ConfigFileBackedConfigProvider implements ConfigProvider {
      * @param target          The target of this identity
      */
     public ConfigFileBackedConfigProvider(@Nullable final IdentityManager identityManager,
-            final DMDircMBassador eventBus, final ConfigFile configFile,
-            final ConfigTarget target) {
+            final ConfigFile configFile, final ConfigTarget target) {
         this.identityManager = identityManager;
         this.file = configFile;
-        this.eventBus = eventBus;
         this.file.setAutomake(true);
         this.myTarget = target;
     }
@@ -470,8 +463,7 @@ public class ConfigFileBackedConfigProvider implements ConfigProvider {
 
                 needSave = false;
             } catch (IOException ex) {
-                eventBus.publish(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
-                        "Unable to save identity file: " + ex.getMessage(), ""));
+                LOG.warn(USER_ERROR, "Unable to save identity file", ex);
             }
         }
     }

src/com/dmdirc/config/ConfigManager.java

@@ -127,7 +127,7 @@ class ConfigManager implements ConfigChangeListener, ConfigProviderListener,
         this.server = server;
         this.channel = chanName;
 
-        binder = new ConfigBinder(this, eventBus);
+        binder = new ConfigBinder(this);
     }
 
     @Override

src/com/dmdirc/config/IdentityManager.java

@@ -24,7 +24,6 @@ package com.dmdirc.config;
 
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.Precondition;
-import com.dmdirc.events.AppErrorEvent;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
@@ -60,6 +59,7 @@ import java.util.stream.Collectors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static com.dmdirc.util.LogUtils.FATAL_APP_ERROR;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -144,7 +144,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
         addonSettings.put("name", "Addon defaults");
         addonConfigFile.addDomain("identity", addonSettings);
 
-        addonConfig = new ConfigFileBackedConfigProvider(this, eventBus, addonConfigFile, target);
+        addonConfig = new ConfigFileBackedConfigProvider(this, addonConfigFile, target);
         addConfigProvider(addonConfig);
     }
 
@@ -156,8 +156,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
             loadIdentity(FileUtils.getPathForResource(getClass().getResource(
                     "defaults/default/formatter")));
         } catch (URISyntaxException ex) {
-            eventBus.publishAsync(new AppErrorEvent(ErrorLevel.FATAL, ex,
-                    "Unable to load settings", ""));
+            LOG.error(FATAL_APP_ERROR, "Unable to load settings", ex);
         }
 
         final Path file = identitiesDirectory.resolve("modealiases");
@@ -265,8 +264,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
         }
 
         try {
-            final ConfigProvider provider = new ConfigFileBackedConfigProvider(this, eventBus,
-                    file, false);
+            final ConfigProvider provider = new ConfigFileBackedConfigProvider(this, file, false);
             addConfigProvider(provider);
             configProvidersByPath.put(file, provider);
         } catch (InvalidIdentityFileException ex) {
@@ -307,7 +305,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
     @Override
     public void loadVersionIdentity() {
         try {
-            versionConfig = new ConfigFileBackedConfigProvider(eventBus, IdentityManager.class.
+            versionConfig = new ConfigFileBackedConfigProvider(IdentityManager.class.
                     getResourceAsStream("/com/dmdirc/version.config"), false);
             addConfigProvider(versionConfig);
         } catch (IOException | InvalidIdentityFileException ex) {
@@ -329,7 +327,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
                 Files.createFile(file);
             }
 
-            config = new ConfigFileBackedConfigProvider(this, eventBus, file, true);
+            config = new ConfigFileBackedConfigProvider(this, file, true);
             config.setOption("identity", "name", "Global config");
             configProvidersByPath.put(file, config);
             addConfigProvider(config);
@@ -653,7 +651,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
         configFile.write();
 
         final ConfigFileBackedConfigProvider identity = new ConfigFileBackedConfigProvider(this,
-                eventBus, file, false);
+                file, false);
         addConfigProvider(identity);
 
         return identity;

src/com/dmdirc/plugins/PluginInfo.java

@@ -267,7 +267,7 @@ public class PluginInfo implements ServiceProvider {
         try (final InputStream stream = Files.newInputStream(path)) {
             synchronized (configProviders) {
                 final ConfigProvider configProvider =
-                        new ConfigFileBackedConfigProvider(eventBus, stream, false);
+                        new ConfigFileBackedConfigProvider(stream, false);
                 identityController.addConfigProvider(configProvider);
                 configProviders.add(configProvider);
             }

src/com/dmdirc/ui/themes/Theme.java

@@ -110,7 +110,7 @@ public class Theme implements Comparable<Theme> {
 
         if (stream != null) {
             try {
-                identity = new ThemeIdentity(eventBus, stream, this);
+                identity = new ThemeIdentity(stream, this);
                 identityController.addConfigProvider(identity);
             } catch (InvalidIdentityFileException | IOException ex) {
                 eventBus.publish(new UserErrorEvent(ErrorLevel.MEDIUM,

src/com/dmdirc/ui/themes/ThemeIdentity.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.ui.themes;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.ConfigFileBackedConfigProvider;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.util.validators.Validator;
@@ -47,9 +46,9 @@ public class ThemeIdentity extends ConfigFileBackedConfigProvider {
      * @throws InvalidIdentityFileException Missing required properties
      * @throws IOException                  Input/output exception
      */
-    public ThemeIdentity(final DMDircMBassador eventBus, final InputStream stream,
-            final Theme theme) throws IOException, InvalidIdentityFileException {
-        super(eventBus, stream, true);
+    public ThemeIdentity(final InputStream stream, final Theme theme)
+            throws IOException, InvalidIdentityFileException {
+        super(stream, true);
 
         myTarget.setTheme();
         this.theme = theme;

test/com/dmdirc/config/ConfigBinderTest.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.config;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import org.junit.Before;
@@ -41,12 +40,11 @@ import static org.mockito.Mockito.when;
 public class ConfigBinderTest {
 
     @Mock private AggregateConfigProvider configProvider;
-    @Mock private DMDircMBassador eventBus;
     private ConfigBinder binder;
 
     @Before
     public void setup() {
-        binder = new ConfigBinder(configProvider, eventBus);
+        binder = new ConfigBinder(configProvider);
     }
 
     @Test

test/com/dmdirc/config/ConfigFileBackedConfigProviderTest.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.config;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.util.io.InvalidConfigFileException;
@@ -65,7 +64,6 @@ public class ConfigFileBackedConfigProviderTest {
 
     @Mock private IdentityManager identityManager;
     @Mock private ConfigChangeListener changeListener;
-    @Mock private DMDircMBassador eventBus;
 
     private FileSystem fs;
 
@@ -80,18 +78,17 @@ public class ConfigFileBackedConfigProviderTest {
 
     @Test(expected = InvalidIdentityFileException.class)
     public void testNoName() throws IOException, InvalidIdentityFileException {
-        new ConfigFileBackedConfigProvider(identityManager, eventBus, fs.getPath("no-name"), false);
+        new ConfigFileBackedConfigProvider(identityManager, fs.getPath("no-name"), false);
     }
 
     @Test(expected = InvalidIdentityFileException.class)
     public void testNoTarget() throws IOException, InvalidIdentityFileException {
-        new ConfigFileBackedConfigProvider(identityManager,  eventBus,fs.getPath("no-target"), false);
+        new ConfigFileBackedConfigProvider(identityManager, fs.getPath("no-target"), false);
     }
 
     @Test(expected = InvalidIdentityFileException.class)
     public void testInvalidConfigFile() throws IOException, InvalidIdentityFileException {
-        new ConfigFileBackedConfigProvider(identityManager, eventBus,
-                fs.getPath("invalid-config-file"), false);
+        new ConfigFileBackedConfigProvider(identityManager, fs.getPath("invalid-config-file"), false);
     }
 
     @Test
@@ -321,8 +318,7 @@ public class ConfigFileBackedConfigProviderTest {
 
     private ConfigFileBackedConfigProvider getProvider(final String file)
             throws IOException, InvalidIdentityFileException {
-        return new ConfigFileBackedConfigProvider(identityManager, eventBus,
-                fs.getPath(file), false);
+        return new ConfigFileBackedConfigProvider(identityManager, fs.getPath(file), false);
     }
 
 }