better variable names (pubAck -> confirm)

Author: Alexandru Scvortov

test/src/com/rabbitmq/examples/MulticastMain.java

@@ -86,8 +86,8 @@ public static void main(String[] args) {
             int consumerCount    = intArg(cmd, 'y', 1);
             int producerTxSize   = intArg(cmd, 'm', 0);
             int consumerTxSize   = intArg(cmd, 'n', 0);
-            boolean pubAck       = cmd.hasOption('c');
-            long pubAckCount     = intArg(cmd, 'k', 0);
+            boolean confirm      = cmd.hasOption('c');
+            long confirmMax      = intArg(cmd, 'k', 0);
             boolean autoAck      = cmd.hasOption('a');
             int prefetchCount    = intArg(cmd, 'q', 0);
             int minMsgSize       = intArg(cmd, 's', 0);
@@ -96,9 +96,9 @@ public static void main(String[] args) {
             int frameMax         = intArg(cmd, 'M', 0);
             int heartbeat        = intArg(cmd, 'b', 0);
 
-            if ((producerTxSize + consumerTxSize > 0) && pubAck) {
+            if ((producerTxSize + consumerTxSize > 0) && confirm) {
                 throw new ParseException("Cannot select both producerTxSize"+
-                                         "/consumerTxSize and pubAck.");
+                                         "/consumerTxSize and confirm");
             }
 
             //setup
@@ -141,13 +141,13 @@ public static void main(String[] args) {
                 producerConnections[i] = conn;
                 Channel channel = conn.createChannel();
                 if (producerTxSize > 0) channel.txSelect();
-                if (pubAck) channel.confirmSelect();
+                if (confirm) channel.confirmSelect();
                 channel.exchangeDeclare(exchangeName, exchangeType);
                 final Producer p = new Producer(channel, exchangeName, id,
                                                 flags, producerTxSize,
                                                 1000L * samplingInterval,
                                                 rateLimit, minMsgSize, timeLimit,
-                                                pubAckCount);
+                                                confirmMax);
                 channel.setReturnListener(p);
                 channel.setAckListener(p);
                 Thread t = new Thread(p);
@@ -193,9 +193,9 @@ private static Options getOptions() {
         options.addOption(new Option("x", "producers", true, "producer count"));
         options.addOption(new Option("y", "consumers", true, "consumer count"));
         options.addOption(new Option("m", "ptxsize",   true, "producer tx size"));
-        options.addOption(new Option("k", "pubackcnt", true, "max unack'd publishes"));
+        options.addOption(new Option("k", "confirmMax", true, "max unconfirmed publishes"));
         options.addOption(new Option("n", "ctxsize",   true, "consumer tx size"));
-        options.addOption(new Option("c", "puback",    false,"publisher acks"));
+        options.addOption(new Option("c", "confirm",   false,"confirm mode"));
         options.addOption(new Option("a", "autoack",   false,"auto ack"));
         options.addOption(new Option("q", "qos",       true, "qos prefetch count"));
         options.addOption(new Option("s", "size",      true, "message size"));
@@ -244,13 +244,13 @@ public static class Producer implements Runnable, ReturnListener, AckListener {
         private int     msgCount;
         private int     basicReturnCount;
 
-        private long    pubAckCount;
+        private long    confirmMax;
         private long    mostRecentAcked;
 
         public Producer(Channel channel, String exchangeName, String id,
                         List flags, int txSize,
                         long interval, int rateLimit, int minMsgSize, int timeLimit,
-                        long pubAckCount)
+                        long confirmMax)
             throws IOException {
 
             this.channel      = channel;
@@ -263,7 +263,7 @@ public Producer(Channel channel, String exchangeName, String id,
             this.interval     = interval;
             this.rateLimit    = rateLimit;
             this.timeLimit    = 1000L * timeLimit;
-            this.pubAckCount  = pubAckCount;
+            this.confirmMax   = confirmMax;
             this.message      = new byte[minMsgSize];
         }
 
@@ -302,7 +302,7 @@ public void run() {
             try {
 
                 while (timeLimit == 0 || now < startTime + timeLimit) {
-                    if (!throttlePubAck()) {
+                    if (!throttleConfirms()) {
                         delay(now);
                         publish(createMessage(totalMsgCount));
                         totalMsgCount++;
@@ -338,8 +338,8 @@ private void publish(byte[] msg)
                                  msg);
         }
 
-        private boolean throttlePubAck() {
-            return ((pubAckCount > 0) && (channel.getNextPublishSeqNo() - mostRecentAcked > pubAckCount));
+        private boolean throttleConfirms() {
+            return ((confirmMax > 0) && (channel.getNextPublishSeqNo() - mostRecentAcked > confirmMax));
         }
 
         private void delay(long now)