Remove another singleton.

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

src/com/dmdirc/addons/ui_swing/MainFrame.java

@@ -519,7 +519,7 @@ public class MainFrame extends JFrame implements WindowListener,
         this.exitCode = exitCode;
         quitting = true;
 
-        quitWorker.get().executeInExecutor();
+        quitWorker.get().execute();
     }
 
     @Override

src/com/dmdirc/addons/ui_swing/QuitWorker.java

@@ -84,12 +84,4 @@ public class QuitWorker extends SwingWorker<Void, Void> {
         super.done();
         mainFrame.dispose();
     }
-
-    /**
-     * Execute this swing worker in the swing worker executor.
-     */
-    public void executeInExecutor() {
-        SwingWorkerExecutor.queue(this);
-    }
-
 }

src/com/dmdirc/addons/ui_swing/SwingWorkerExecutor.java

@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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;
-
-import java.util.concurrent.Executors;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Executor for creating swing worker daemon threads. Workaround for bug
- * http://bugs.sun.com/view_bug.do?bug_id=6880336
- */
-public final class SwingWorkerExecutor extends ThreadPoolExecutor implements
-        ThreadFactory {
-
-    /** Max number of swing worker threads. */
-    private static final int MAX_WORKERS = 20;
-    /** Static instance. */
-    public static final SwingWorkerExecutor EXECUTOR = new SwingWorkerExecutor();
-
-    /**
-     * Creates a new swing worker executor.
-     */
-    private SwingWorkerExecutor() {
-        super(1, MAX_WORKERS, 2L, TimeUnit.MINUTES,
-                new LinkedBlockingQueue<Runnable>());
-        setThreadFactory(this);
-    }
-
-    @Override
-    public Thread newThread(final Runnable r) {
-        final Thread thread = Executors.defaultThreadFactory().newThread(r);
-        thread.setName("SwingWorker-" + thread.getName());
-        thread.setDaemon(true);
-        return thread;
-    }
-
-    /**
-     * Queues the specified runnable on this executor.
-     *
-     * @param runnable Runnable to execute
-     */
-    public static void queue(final Runnable runnable) {
-        EXECUTOR.execute(runnable);
-    }
-
-}

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

@@ -72,7 +72,7 @@ public class FontPicker extends JComboBox<Object> {
                     Logger.appError(ErrorLevel.MEDIUM, ex.getMessage(), ex);
                 }
             }
-        }.executeInExecutor();
+        }.execute();
     }
 
     /**

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components;
 
-import com.dmdirc.addons.ui_swing.SwingWorkerExecutor;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 
@@ -52,11 +51,4 @@ public abstract class LoggingSwingWorker<T, V> extends SwingWorker<T, V> {
         }
     }
 
-    /**
-     * Execute this swing worker in the swing worker executor.
-     */
-    public void executeInExecutor() {
-        SwingWorkerExecutor.queue(this);
-    }
-
 }

src/com/dmdirc/addons/ui_swing/components/addonbrowser/BrowserWindow.java

@@ -190,7 +190,7 @@ public class BrowserWindow extends JDialog implements ActionListener {
      * @param download Download new addon feed?
      */
     public final void loadData(final boolean download) {
-        loaderFactory.getDataLoaderWorker(list, download, this, scrollPane).executeInExecutor();
+        loaderFactory.getDataLoaderWorker(list, download, this, scrollPane).execute();
     }
 
     /**

src/com/dmdirc/addons/ui_swing/components/addonbrowser/InstallListener.java

@@ -62,7 +62,7 @@ public class InstallListener implements ActionListener {
     public void actionPerformed(final ActionEvent e) {
         final InstallerWindow installer = new InstallerWindow(parentWindow, info);
         installer.display(parentWindow);
-        workerFactory.getInstallWorker(info, installer).executeInExecutor();
+        workerFactory.getInstallWorker(info, installer).execute();
     }
 
 }

src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonPanel.java

@@ -146,7 +146,7 @@ public abstract class AddonPanel extends JPanel implements AddonToggleListener,
                     }
                 });
             }
-        }.executeInExecutor();
+        }.execute();
     }
 
     /** Lays out the dialog. */

src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputHandler.java

@@ -163,7 +163,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
                     protected void done() {
                         localTarget.setEditable(true);
                     }
-                }.executeInExecutor();
+                }.execute();
             }
         });
         localTarget.getActionMap().put("insert-shift-tab",
@@ -186,7 +186,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
                             protected void done() {
                                 localTarget.setEditable(true);
                             }
-                        }.executeInExecutor();
+                        }.execute();
                     }
                 });
         localTarget.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).
@@ -239,7 +239,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
                                     enterPressed(line);
                                     return null;
                                 }
-                            }.executeInExecutor();
+                            }.execute();
                         }
                     }
                 });

src/com/dmdirc/addons/ui_swing/dialogs/FeedbackDialog.java

@@ -235,7 +235,7 @@ public class FeedbackDialog extends StandardDialog implements ActionListener, Do
         }
         new SendWorker(this, config, name.getText().trim(), email.getText().trim(),
                 feedback.getText().trim(), serverInfo.toString().trim(),
-                dmdircInfo.toString().trim()).executeInExecutor();
+                dmdircInfo.toString().trim()).execute();
     }
 
     /** Validates the input. */

src/com/dmdirc/addons/ui_swing/dialogs/NewServerDialog.java

@@ -287,7 +287,7 @@ public class NewServerDialog extends StandardDialog implements
                         serverManager.connectToAddress(address, profile);
                         return null;
                     }
-                }.executeInExecutor();
+                }.execute();
             } else {
                 final Connection connection = activeFrameManager.getActiveFrame().getContainer().
                         getConnection();
@@ -303,7 +303,7 @@ public class NewServerDialog extends StandardDialog implements
                         }
                         return null;
                     }
-                }.executeInExecutor();
+                }.execute();
             }
         } catch (URISyntaxException ex) {
             Logger.userError(ErrorLevel.MEDIUM, "Unable to create URI", ex);

src/com/dmdirc/addons/ui_swing/dialogs/about/LicencesPanel.java

@@ -82,7 +82,7 @@ public class LicencesPanel extends JPanel implements TreeSelectionListener {
 
         this.config = globalConfig;
         initComponents();
-        new LicenceLoader(pluginManager, list, listModel).executeInExecutor();
+        new LicenceLoader(pluginManager, list, listModel).execute();
         addListeners();
         layoutComponents();
     }

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

@@ -65,8 +65,7 @@ public class CategoryLabel extends JLabel {
         this.parentList = parentList;
 
         setText(category.getTitle());
-        new IconLoader(iconManager, this, category.getIcon())
-                .executeInExecutor();
+        new IconLoader(iconManager, this, category.getIcon()).execute();
 
         int level = 0;
         PreferencesCategory temp = category;

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

@@ -215,7 +215,7 @@ public class CategoryPanel extends JPanel {
             });
 
             worker = new PrefsCategoryLoader(factory, this, category);
-            worker.executeInExecutor();
+            worker.execute();
         } else {
             categoryLoaded(category);
         }

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

@@ -141,7 +141,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
                 }
             }
         };
-        worker.executeInExecutor();
+        worker.execute();
     }
 
     private void setPrefsManager(final PreferencesDialogModel manager) {
@@ -254,7 +254,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
                 }
                 return null;
             }
-        }.executeInExecutor();
+        }.execute();
         dispose();
     }
 

src/com/dmdirc/addons/ui_swing/dialogs/updater/SwingUpdaterDialog.java

@@ -199,7 +199,7 @@ public class SwingUpdaterDialog extends StandardDialog implements
                     }
                     return null;
                 }
-            }.executeInExecutor();
+            }.execute();
 
             if (updateManager.getManagerStatus() == UpdateManagerStatus.IDLE_RESTART_NEEDED) {
                 restartDialogProvider.displayOrRequestFocus();

src/com/dmdirc/addons/ui_swing/textpane/BackgroundPainter.java

@@ -124,7 +124,7 @@ public class BackgroundPainter extends LayerUI<JComponent> {
         if (value == null || value.isEmpty()) {
             backgroundImage = null;
         } else {
-            new ImageLoader(urlBuilder.getUrl(value), this).executeInExecutor();
+            new ImageLoader(urlBuilder.getUrl(value), this).execute();
         }
     }