QPID-5980: tweak javadoc for QMF2 bits to remove errors (but not warnings), allow success when processing with the strict new Java8 tooling

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1616848 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 9 insertions, 9 deletions

diff --git a/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/ConnectionAudit.java b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/ConnectionAudit.java
index 9912b2c228..7f6109cb7a 100644
--- a/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/ConnectionAudit.java
+++ b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/ConnectionAudit.java
@@ -149,7 +149,7 @@ public final class ConnectionAudit implements QmfEventListener
     private Set<String> _queueWhitelist = new HashSet<String>();
 
     /**
-     * Basic constructor. Creates JMS Session, Initialises Destinations, Producers & Consumers and starts connection.
+     * Basic constructor. Creates JMS Session, Initialises Destinations, Producers &amp; Consumers and starts connection.
      * @param url the connection URL.
      * @param connectionOptions the options String to pass to ConnectionHelper.
      * @param whitelist the path name of the whitelist XML file.
diff --git a/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/ConnectionLogger.java b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/ConnectionLogger.java
index 6097c4a752..f9364b4069 100644
--- a/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/ConnectionLogger.java
+++ b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/ConnectionLogger.java
@@ -102,10 +102,10 @@ public final class ConnectionLogger implements QmfEventListener
     private boolean _stateChanged = false; 
 
     /**
-     * Basic constructor. Creates JMS Session, Initialises Destinations, Producers & Consumers and starts connection.
+     * Basic constructor. Creates JMS Session, Initialises Destinations, Producers &amp; Consumers and starts connection.
      * @param url the connection URL.
      * @param connectionOptions the options String to pass to ConnectionHelper.
-     * @param logQueues flags whether queue & binding information is logged as well as connection info.
+     * @param logQueues flags whether queue &amp; binding information is logged as well as connection info.
      */
     public ConnectionLogger(final String url, final String connectionOptions, final boolean logQueues)
     {
diff --git a/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java
index 8c9d41e199..fad52cbb00 100644
--- a/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java
+++ b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java
@@ -54,7 +54,7 @@ import org.apache.qpid.qmf2.util.GetOpt;
  * It's vaguely pointless, as the python qpid-config is the "canonical" qpid-config :-)
  * Nonetheless, it's a useful intellectual exercise to illustrate using QMF2 from Java.
  * <p>
- * QpidConfig (unlike the python qpid-config) uses pure QMF2 for adding/deleting queues, exchanges & bindings
+ * QpidConfig (unlike the python qpid-config) uses pure QMF2 for adding/deleting queues, exchanges &amp; bindings
  * this provides useful illustration of how to do these things using the ManagementAgent method calls.
  * <p>
  * N.B. "create" and "delete" broker ManagementAgent methods were added in Qpid version 0.10, unfortunately these
@@ -64,7 +64,7 @@ import org.apache.qpid.qmf2.util.GetOpt;
  *         qpid-config [OPTIONS] exchanges [filter-string]
  *         qpid-config [OPTIONS] queues    [filter-string]
  *         qpid-config [OPTIONS] add exchange &lt;type&gt; &lt;name&gt; [AddExchangeOptions]
- *         qpid-config [OPTIONS] del exchange &ltname&gt;
+ *         qpid-config [OPTIONS] del exchange &lt;name&gt;
  *         qpid-config [OPTIONS] add queue &lt;name&gt; [AddQueueOptions]
  *         qpid-config [OPTIONS] del queue &lt;name&gt; [DelQueueOptions]
  *         qpid-config [OPTIONS] bind   &lt;exchange-name&gt; &lt;queue-name&gt; [binding-key]
diff --git a/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidCtrl.java b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidCtrl.java
index 0e945a7ed1..fa06b06519 100644
--- a/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidCtrl.java
+++ b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidCtrl.java
@@ -167,7 +167,7 @@ public final class QpidCtrl
     private Console _console;
 
     /**
-     * Basic constructor. Creates JMS Session, Initialises Destinations, Producers & Consumers and starts connection.
+     * Basic constructor. Creates JMS Session, Initialises Destinations, Producers &amp; Consumers and starts connection.
      * @param url the Connection URL.
      * @param connectionOptions the connection options String to pass to ConnectionHelper.
      * @param pkg the package name of the object we're invoking the method on.
diff --git a/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidPrintEvents.java b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidPrintEvents.java
index 52c8dcec27..34a38bf8d7 100644
--- a/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidPrintEvents.java
+++ b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidPrintEvents.java
@@ -107,7 +107,7 @@ public final class QpidPrintEvents implements QmfEventListener
     private Console _console;
 
     /**
-     * Basic constructor. Creates JMS Session, Initialises Destinations, Producers & Consumers and starts connection.
+     * Basic constructor. Creates JMS Session, Initialises Destinations, Producers &amp; Consumers and starts connection.
      * @param url the connection URL.
      * @param connectionOptions the options String to pass to ConnectionHelper.
      */
diff --git a/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidQueueStats.java b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidQueueStats.java
index 1d6f1d1bf5..4ac434dc17 100644
--- a/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidQueueStats.java
+++ b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidQueueStats.java
@@ -139,7 +139,7 @@ public final class QpidQueueStats implements QmfEventListener
     private long _startTime;
 
     /**
-     * Basic constructor. Creates JMS Session, Initialises Destinations, Producers & Consumers and starts connection.
+     * Basic constructor. Creates JMS Session, Initialises Destinations, Producers &amp; Consumers and starts connection.
      * @param url the connection URL.
      * @param connectionOptions the options String to pass to ConnectionHelper.
      * @param filter a list of regex Patterns used to choose the queues we wish to display.
diff --git a/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QueueFuse.java b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QueueFuse.java
index f60dbbf4f3..31368ed242 100644
--- a/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QueueFuse.java
+++ b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QueueFuse.java
@@ -160,7 +160,7 @@ public final class QueueFuse implements QmfEventListener
     private Console _console;
 
     /**
-     * Basic constructor. Creates JMS Session, Initialises Destinations, Producers & Consumers and starts connection.
+     * Basic constructor. Creates JMS Session, Initialises Destinations, Producers &amp; Consumers and starts connection.
      * @param url the connection URL.
      * @param connectionOptions the options String to pass to ConnectionHelper.
      * @param filter a list of regex Patterns used to choose the queues we wish to protect.