Browse Source

Merge pull request #121 from csmith/master

Rename QueueFactory to QueueHandlerFactory.
pull/122/head
Greg Holmes 8 years ago
parent
commit
7cf1287639

+ 11
- 11
irc/src/com/dmdirc/parser/irc/outputqueue/OutputQueue.java View File

46
     private final Object queueHandlerLock = new Object();
46
     private final Object queueHandlerLock = new Object();
47
     /** Thread for the sending queue. */
47
     /** Thread for the sending queue. */
48
     private QueueHandler queueHandler;
48
     private QueueHandler queueHandler;
49
-    /** The QueueFactory for this OutputQueue. */
50
-    private QueueFactory queueFactory = PriorityQueueHandler.getFactory();
49
+    /** The QueueHandlerFactory for this OutputQueue. */
50
+    private QueueHandlerFactory queueHandlerFactory = PriorityQueueHandler.getFactory();
51
 
51
 
52
     /**
52
     /**
53
      * Set the output stream for this queue.
53
      * Set the output stream for this queue.
68
     }
68
     }
69
 
69
 
70
     /**
70
     /**
71
-     * Set the QueueFactory.
71
+     * Set the QueueHandlerFactory.
72
      * Changing this will not change an existing QueueHandler unless queueing is
72
      * Changing this will not change an existing QueueHandler unless queueing is
73
      * disabled and reenabled.
73
      * disabled and reenabled.
74
      * If this is called before the first lien of output is queued then there is
74
      * If this is called before the first lien of output is queued then there is
75
      * no need to disable and reenable the queue.
75
      * no need to disable and reenable the queue.
76
      *
76
      *
77
-     * @param factory New QueueFactory to use.
77
+     * @param factory New QueueHandlerFactory to use.
78
      */
78
      */
79
-    public void setQueueFactory(final QueueFactory factory) {
80
-        queueFactory = factory;
79
+    public void setQueueHandlerFactory(final QueueHandlerFactory factory) {
80
+        queueHandlerFactory = factory;
81
     }
81
     }
82
 
82
 
83
     /**
83
     /**
84
-     * Get the QueueFactory.
84
+     * Get the QueueHandlerFactory.
85
      *
85
      *
86
-     * @return The current QueueFactory.
86
+     * @return The current QueueHandlerFactory.
87
      */
87
      */
88
-    public QueueFactory getQueueManager() {
89
-        return queueFactory;
88
+    public QueueHandlerFactory getQueueHandlerFactory() {
89
+        return queueHandlerFactory;
90
     }
90
     }
91
 
91
 
92
     /**
92
     /**
204
         if (queueEnabled && priority != QueuePriority.IMMEDIATE) {
204
         if (queueEnabled && priority != QueuePriority.IMMEDIATE) {
205
             synchronized (queueHandlerLock) {
205
             synchronized (queueHandlerLock) {
206
                 if (queueHandler == null || !queueHandler.isAlive()) {
206
                 if (queueHandler == null || !queueHandler.isAlive()) {
207
-                    queueHandler = queueFactory.getQueueHandler(this, queue, out);
207
+                    queueHandler = queueHandlerFactory.getQueueHandler(this, queue, out);
208
                     queueHandler.start();
208
                     queueHandler.start();
209
                 }
209
                 }
210
 
210
 

+ 3
- 3
irc/src/com/dmdirc/parser/irc/outputqueue/PriorityQueueHandler.java View File

42
     }
42
     }
43
 
43
 
44
     /**
44
     /**
45
-     * Get a QueueFactory that produces PriorityQueueHandlers.
45
+     * Get a QueueHandlerFactory that produces PriorityQueueHandlers.
46
      *
46
      *
47
-     * @return a QueueFactory that produces PrirortyQueueHandlers.
47
+     * @return a QueueHandlerFactory that produces PrirortyQueueHandlers.
48
      */
48
      */
49
-    public static QueueFactory getFactory() {
49
+    public static QueueHandlerFactory getFactory() {
50
         return PriorityQueueHandler::new;
50
         return PriorityQueueHandler::new;
51
     }
51
     }
52
 
52
 

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

26
 import java.util.concurrent.BlockingQueue;
26
 import java.util.concurrent.BlockingQueue;
27
 
27
 
28
 /**
28
 /**
29
- * A QueueFactory produces QueueHandlers for OutputQueue.
29
+ * A QueueHandlerFactory produces QueueHandlers for OutputQueue.
30
  */
30
  */
31
-public interface QueueFactory {
31
+public interface QueueHandlerFactory {
32
 
32
 
33
     /**
33
     /**
34
      * Get a new QueueHandler instance as needed.
34
      * Get a new QueueHandler instance as needed.

+ 3
- 3
irc/src/com/dmdirc/parser/irc/outputqueue/SimpleRateLimitedQueueHandler.java View File

62
     }
62
     }
63
 
63
 
64
     /**
64
     /**
65
-     * Get a QueueFactory that produces PriorityQueueHandlers.
65
+     * Get a QueueHandlerFactory that produces PriorityQueueHandlers.
66
      *
66
      *
67
-     * @return a QueueFactory that produces PrirortyQueueHandlers.
67
+     * @return a QueueHandlerFactory that produces PrirortyQueueHandlers.
68
      */
68
      */
69
-    public static QueueFactory getFactory() {
69
+    public static QueueHandlerFactory getFactory() {
70
         return SimpleRateLimitedQueueHandler::new;
70
         return SimpleRateLimitedQueueHandler::new;
71
     }
71
     }
72
 
72
 

Loading…
Cancel
Save