Rename QueueFactory to QueueHandlerFactory.

irc/src/com/dmdirc/parser/irc/outputqueue/OutputQueue.java

@@ -46,8 +46,8 @@ public class OutputQueue {
     private final Object queueHandlerLock = new Object();
     /** Thread for the sending queue. */
     private QueueHandler queueHandler;
-    /** The QueueFactory for this OutputQueue. */
-    private QueueFactory queueFactory = PriorityQueueHandler.getFactory();
+    /** The QueueHandlerFactory for this OutputQueue. */
+    private QueueHandlerFactory queueHandlerFactory = PriorityQueueHandler.getFactory();
 
     /**
      * Set the output stream for this queue.
@@ -68,25 +68,25 @@ public class OutputQueue {
     }
 
     /**
-     * Set the QueueFactory.
+     * Set the QueueHandlerFactory.
      * Changing this will not change an existing QueueHandler unless queueing is
      * disabled and reenabled.
      * If this is called before the first lien of output is queued then there is
      * no need to disable and reenable the queue.
      *
-     * @param factory New QueueFactory to use.
+     * @param factory New QueueHandlerFactory to use.
      */
-    public void setQueueFactory(final QueueFactory factory) {
-        queueFactory = factory;
+    public void setQueueHandlerFactory(final QueueHandlerFactory factory) {
+        queueHandlerFactory = factory;
     }
 
     /**
-     * Get the QueueFactory.
+     * Get the QueueHandlerFactory.
      *
-     * @return The current QueueFactory.
+     * @return The current QueueHandlerFactory.
      */
-    public QueueFactory getQueueManager() {
-        return queueFactory;
+    public QueueHandlerFactory getQueueHandlerFactory() {
+        return queueHandlerFactory;
     }
 
     /**
@@ -204,7 +204,7 @@ public class OutputQueue {
         if (queueEnabled && priority != QueuePriority.IMMEDIATE) {
             synchronized (queueHandlerLock) {
                 if (queueHandler == null || !queueHandler.isAlive()) {
-                    queueHandler = queueFactory.getQueueHandler(this, queue, out);
+                    queueHandler = queueHandlerFactory.getQueueHandler(this, queue, out);
                     queueHandler.start();
                 }
 

irc/src/com/dmdirc/parser/irc/outputqueue/PriorityQueueHandler.java

@@ -42,11 +42,11 @@ public class PriorityQueueHandler extends QueueHandler {
     }
 
     /**
-     * Get a QueueFactory that produces PriorityQueueHandlers.
+     * Get a QueueHandlerFactory that produces PriorityQueueHandlers.
      *
-     * @return a QueueFactory that produces PrirortyQueueHandlers.
+     * @return a QueueHandlerFactory that produces PrirortyQueueHandlers.
      */
-    public static QueueFactory getFactory() {
+    public static QueueHandlerFactory getFactory() {
         return PriorityQueueHandler::new;
     }
 

irc/src/com/dmdirc/parser/irc/outputqueue/QueueFactory.java → irc/src/com/dmdirc/parser/irc/outputqueue/QueueHandlerFactory.java

@@ -26,9 +26,9 @@ import java.io.PrintWriter;
 import java.util.concurrent.BlockingQueue;
 
 /**
- * A QueueFactory produces QueueHandlers for OutputQueue.
+ * A QueueHandlerFactory produces QueueHandlers for OutputQueue.
  */
-public interface QueueFactory {
+public interface QueueHandlerFactory {
 
     /**
      * Get a new QueueHandler instance as needed.

irc/src/com/dmdirc/parser/irc/outputqueue/SimpleRateLimitedQueueHandler.java

@@ -62,11 +62,11 @@ public class SimpleRateLimitedQueueHandler extends QueueHandler {
     }
 
     /**
-     * Get a QueueFactory that produces PriorityQueueHandlers.
+     * Get a QueueHandlerFactory that produces PriorityQueueHandlers.
      *
-     * @return a QueueFactory that produces PrirortyQueueHandlers.
+     * @return a QueueHandlerFactory that produces PrirortyQueueHandlers.
      */
-    public static QueueFactory getFactory() {
+    public static QueueHandlerFactory getFactory() {
         return SimpleRateLimitedQueueHandler::new;
     }