Split RunnableLoggingSwingWorker into two.

ui_swing/src/com/dmdirc/addons/ui_swing/components/RunnableLoggingSwingWorker.java

@@ -23,35 +23,14 @@
 package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.events.UserErrorEvent;
-import com.dmdirc.logger.ErrorLevel;
 
 import java.util.List;
-import java.util.concurrent.ExecutionException;
 import java.util.function.Consumer;
-import java.util.function.Supplier;
 
 /**
  * {@link LoggingSwingWorker} that runs a {@link Runnable}.
  */
-public class RunnableLoggingSwingWorker<T, V> extends LoggingSwingWorker<T, V> {
-
-    private final DMDircMBassador eventBus;
-    private final Consumer<T> doneConsumer;
-    private final Consumer<List<V>> processConsumer;
-    private Supplier<T> backgroundSupplier;
-    private Runnable backgroundRunnable;
-
-    /**
-     * Creates a new logging swing worker.
-     *
-     * @param eventBus           Event bus to post errors to.
-     * @param backgroundSupplier The supplier to call as the background task, off the EDT.
-     */
-    public RunnableLoggingSwingWorker(final DMDircMBassador eventBus,
-            final Supplier<T> backgroundSupplier) {
-        this(eventBus, backgroundSupplier, result -> {});
-    }
+public class RunnableLoggingSwingWorker<T, V> extends SupplierLoggingSwingWorker<T, V> {
 
     /**
      * Creates a new logging swing worker.
@@ -64,19 +43,6 @@ public class RunnableLoggingSwingWorker<T, V> extends LoggingSwingWorker<T, V> {
         this(eventBus, backgroundRunnable, result -> {});
     }
 
-    /**
-     * Creates a new logging swing worker.
-     *
-     * @param eventBus           Event bus to post errors to.
-     * @param backgroundSupplier The supplier to call as the background task, off the EDT.
-     * @param doneConsumer       The consumer called when the background task is complete
-     */
-    public RunnableLoggingSwingWorker(final DMDircMBassador eventBus,
-            final Supplier<T> backgroundSupplier,
-            final Consumer<T> doneConsumer) {
-        this(eventBus, backgroundSupplier, doneConsumer, chunks -> {});
-    }
-
     /**
      * Creates a new logging swing worker.
      *
@@ -90,26 +56,6 @@ public class RunnableLoggingSwingWorker<T, V> extends LoggingSwingWorker<T, V> {
         this(eventBus, backgroundRunnable, doneConsumer, chunks -> {});
     }
 
-    /**
-     * Creates a new logging swing worker.
-     *
-     * @param eventBus           Event bus to post errors to.
-     * @param backgroundSupplier The supplier to call as the background task, off the EDT.
-     * @param doneConsumer       The consumer called when the background task is complete
-     * @param processConsumer    The consumer called to process results of the background task
-     *                           as it progresses
-     */
-    public RunnableLoggingSwingWorker(final DMDircMBassador eventBus,
-            final Supplier<T> backgroundSupplier,
-            final Consumer<T> doneConsumer,
-            final Consumer<List<V>> processConsumer) {
-        super(eventBus);
-        this.eventBus = eventBus;
-        this.backgroundSupplier = backgroundSupplier;
-        this.doneConsumer = doneConsumer;
-        this.processConsumer = processConsumer;
-    }
-
     /**
      * Creates a new logging swing worker.
      *
@@ -123,40 +69,6 @@ public class RunnableLoggingSwingWorker<T, V> extends LoggingSwingWorker<T, V> {
             final Runnable backgroundRunnable,
             final Consumer<T> doneConsumer,
             final Consumer<List<V>> processConsumer) {
-        super(eventBus);
-        this.eventBus = eventBus;
-        this.backgroundRunnable = backgroundRunnable;
-        this.doneConsumer = doneConsumer;
-        this.processConsumer = processConsumer;
-    }
-
-    @Override
-    protected T doInBackground() throws Exception {
-        if (backgroundSupplier == null) {
-            backgroundRunnable.run();
-            return null;
-        } else {
-            return backgroundSupplier.get();
-        }
-    }
-
-    @Override
-    protected void process(final List<V> chunks) {
-        processConsumer.accept(chunks);
-    }
-
-    @Override
-    protected void done() {
-        try {
-            handleDone(get());
-        } catch (InterruptedException ex) {
-            //Ignore
-        } catch (ExecutionException ex) {
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, ex, ex.getMessage(), ""));
-        }
-    }
-
-    public void handleDone(final T value) {
-        doneConsumer.accept(value);
+        super(eventBus, () -> { backgroundRunnable.run(); return null; } , doneConsumer, processConsumer);
     }
 }

ui_swing/src/com/dmdirc/addons/ui_swing/components/SupplierLoggingSwingWorker.java

@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2006-2015 DMDirc Developers
+ *
+ * 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 com.dmdirc.addons.ui_swing.components;
+
+import com.dmdirc.DMDircMBassador;
+import com.dmdirc.events.UserErrorEvent;
+import com.dmdirc.logger.ErrorLevel;
+
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+/**
+ * {@link LoggingSwingWorker} that runs a {@link Supplier}.
+ */
+public class SupplierLoggingSwingWorker<T, V> extends LoggingSwingWorker<T, V> {
+
+    private final DMDircMBassador eventBus;
+    private final Consumer<T> doneConsumer;
+    private final Consumer<List<V>> processConsumer;
+    private final Supplier<T> backgroundSupplier;
+
+    /**
+     * Creates a new logging swing worker.
+     *
+     * @param eventBus           Event bus to post errors to.
+     * @param backgroundSupplier The supplier to call as the background task, off the EDT.
+     */
+    public SupplierLoggingSwingWorker(final DMDircMBassador eventBus,
+            final Supplier<T> backgroundSupplier) {
+        this(eventBus, backgroundSupplier, result -> {});
+    }
+
+    /**
+     * Creates a new logging swing worker.
+     *
+     * @param eventBus           Event bus to post errors to.
+     * @param backgroundSupplier The supplier to call as the background task, off the EDT.
+     * @param doneConsumer       The consumer called when the background task is complete
+     */
+    public SupplierLoggingSwingWorker(final DMDircMBassador eventBus,
+            final Supplier<T> backgroundSupplier,
+            final Consumer<T> doneConsumer) {
+        this(eventBus, backgroundSupplier, doneConsumer, chunks -> {});
+    }
+
+    /**
+     * Creates a new logging swing worker.
+     *
+     * @param eventBus           Event bus to post errors to.
+     * @param backgroundSupplier The supplier to call as the background task, off the EDT.
+     * @param doneConsumer       The consumer called when the background task is complete
+     * @param processConsumer    The consumer called to process results of the background task
+     *                           as it progresses
+     */
+    public SupplierLoggingSwingWorker(final DMDircMBassador eventBus,
+            final Supplier<T> backgroundSupplier,
+            final Consumer<T> doneConsumer,
+            final Consumer<List<V>> processConsumer) {
+        super(eventBus);
+        this.eventBus = eventBus;
+        this.backgroundSupplier = backgroundSupplier;
+        this.doneConsumer = doneConsumer;
+        this.processConsumer = processConsumer;
+    }
+
+    @Override
+    protected T doInBackground() throws Exception {
+        return backgroundSupplier.get();
+    }
+
+    @Override
+    protected void process(final List<V> chunks) {
+        processConsumer.accept(chunks);
+    }
+
+    @Override
+    protected void done() {
+        try {
+            handleDone(get());
+        } catch (InterruptedException ex) {
+            //Ignore
+        } catch (ExecutionException ex) {
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, ex, ex.getMessage(), ""));
+        }
+    }
+
+    public void handleDone(final T value) {
+        doneConsumer.accept(value);
+    }
+}

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/prefs/SwingPreferencesDialog.java

@@ -27,6 +27,7 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.addons.ui_swing.components.ListScroller;
 import com.dmdirc.addons.ui_swing.components.RunnableLoggingSwingWorker;
+import com.dmdirc.addons.ui_swing.components.SupplierLoggingSwingWorker;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingRestartDialog;
 import com.dmdirc.addons.ui_swing.injection.DialogModule.ForSettings;
@@ -111,26 +112,30 @@ public final class SwingPreferencesDialog extends StandardDialog implements
 
         initComponents();
 
-        worker = new RunnableLoggingSwingWorker<>(eventBus, () -> {
-            mainPanel.setWaiting(true);
-            PreferencesDialogModel prefsManager = null;
-            try {
-                prefsManager = dialogModelProvider.get();
-            } catch (IllegalArgumentException ex) {
-                mainPanel.setError(ex.getMessage());
-                eventBus.publishAsync(new UserErrorEvent(ErrorLevel.HIGH, ex,
-                        "Unable to load the preferences dialog", ""));
-            }
-            return prefsManager;
-        },
+        worker = new SupplierLoggingSwingWorker<>(eventBus,
+                () -> getPrefsModel(dialogModelProvider),
                 value -> {
                     if (value != null) {
                         setPrefsManager(value);
                     }
-        });
+                });
         worker.execute();
     }
 
+    private PreferencesDialogModel getPrefsModel(
+            final Provider<PreferencesDialogModel> dialogModelProvider) {
+        mainPanel.setWaiting(true);
+        PreferencesDialogModel prefsManager = null;
+        try {
+            prefsManager = dialogModelProvider.get();
+        } catch (IllegalArgumentException ex) {
+            mainPanel.setError(ex.getMessage());
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.HIGH, ex,
+                    "Unable to load the preferences dialog", ""));
+        }
+        return prefsManager;
+    }
+
     private void setPrefsManager(final PreferencesDialogModel manager) {
         this.manager = manager;