JAVADOC fixes.

Author: aunkrig

commons-compiler-jdk/src/org/codehaus/commons/compiler/jdk/ExpressionEvaluator.java

@@ -68,7 +68,7 @@
  * On my system (Intel P4, 2 GHz, MS Windows XP, JDK 1.4.1), expression "x + 1"
  * evaluates as follows:
  * <table>
- *   <tr><td></td><th>Server JVM</th><th>Client JVM</th></td></tr>
+ *   <tr><td></td><th>Server JVM</th><th>Client JVM</th></tr>
  *   <tr><td>Normal EE</td><td>23.7 ns</td><td>64.0 ns</td></tr>
  *   <tr><td>Fast EE</td><td>31.2 ns</td><td>42.2 ns</td></tr>
  * </table>

janino/src/org/codehaus/janino/ByteArrayClassLoader.java

@@ -35,7 +35,7 @@ class ByteArrayClassLoader extends ClassLoader {
     /**
      * The given {@link Map} of classes must not be modified afterwards.
      *
-     * @param classes String className => byte[] data
+     * @param classes String className => byte[] data
      */
     public
     ByteArrayClassLoader(Map<String /*className*/, byte[] /*data*/> classes) { this.classes = classes; }

janino/src/org/codehaus/janino/CachingJavaSourceClassLoader.java

@@ -126,7 +126,7 @@ class CachingJavaSourceClassLoader extends JavaSourceClassLoader {
     /**
      * Override {@link JavaSourceClassLoader#generateBytecodes(String)} to implement class file caching.
      *
-     * @return                        String name => byte[] bytecode, or {@code null} if no source code could be found
+     * @return                        String name => byte[] bytecode, or {@code null} if no source code could be found
      * @throws ClassNotFoundException Compilation problems or class file cache I/O problems
      */
     @Override protected Map<String /*name*/, byte[] /*bytecode*/>

janino/src/org/codehaus/janino/ExpressionEvaluator.java

@@ -82,7 +82,7 @@
  * On my system (Intel P4, 2 GHz, MS Windows XP, JDK 1.4.1), expression "x + 1"
  * evaluates as follows:
  * <table>
- *   <tr><td></td><th>Server JVM</th><th>Client JVM</th></td></tr>
+ *   <tr><td></td><th>Server JVM</th><th>Client JVM</th></tr>
  *   <tr><td>Normal EE</td><td>23.7 ns</td><td>64.0 ns</td></tr>
  *   <tr><td>Fast EE</td><td>31.2 ns</td><td>42.2 ns</td></tr>
  * </table>
@@ -191,7 +191,11 @@ class ExpressionEvaluator extends ScriptEvaluator implements IExpressionEvaluato
     }
 
     /**
-     * Equivalent to<pre>
+     * Creates an expression evaluator with the full configurability.
+     * <p>
+     *   Equivalent to:
+     * </p>
+     * <pre>
      * ExpressionEvaluator ee = new ExpressionEvaluator();
      * ee.setClassName(className);
      * ee.setExtendedType(optionalExtendedType);
@@ -203,6 +207,7 @@ class ExpressionEvaluator extends ScriptEvaluator implements IExpressionEvaluato
      * ee.setThrownExceptions(thrownExceptions);
      * ee.setParentClassLoader(optionalParentClassLoader);
      * ee.cook(scanner);
+     * </pre>
      *
      * @see IExpressionEvaluator
      * @see IClassBodyEvaluator#setClassName(String)

janino/src/org/codehaus/janino/Java.java

@@ -1468,7 +1468,7 @@ class FunctionDeclarator extends AbstractTypeBodyDeclaration implements DocComme
         /** The return type of the function (VOID for constructors). */
         public final Type type;
 
-        /** The name of the function ("<init>" for constructors. */
+        /** The name of the function ({@code "<init>"} for constructors). */
         public final String name;
 
         /** The parameters of the function. */
@@ -3697,7 +3697,7 @@ class Instanceof extends Rvalue {
      *   <dd>JLS7 15.21 'equality operation'
      *   <dt>!=
      *   <dd>JLS7 15.22 'non-equality operation'
-     *   <dt>&lt; > &lt;= >=
+     *   <dt>&lt; &gt; &lt;= &gt;=
      *   <dd>JLS7 15.20.1 'numerical comparison operations'
      * </dl>
      * Operations with non-boolean result:
@@ -3712,7 +3712,7 @@ class Instanceof extends Rvalue {
      *   <dd>JLS7 15.17 'multiplicative operations'
      *   <dt>+ -
      *   <dd>JLS7 15.18 'additive operations'
-     *   <dt>&lt;&lt; >> >>>
+     *   <dt>&lt;&lt; &gt;&gt; &gt;&gt;&gt;
      *   <dd>JLS7 15.19 'shift operations'
      * </dl>
      */

janino/src/org/codehaus/janino/JavaSourceClassLoader.java

@@ -206,7 +206,7 @@ class JavaSourceClassLoader extends AbstractJavaSourceClassLoader {
      * bytecode. This may cause more compilation units being scanned and parsed. Continue until
      * all compilation units are compiled.
      *
-     * @return String name => byte[] bytecode, or <code>null</code> if no source code could be found
+     * @return String name =&gt; byte[] bytecode, or <code>null</code> if no source code could be found
      * @throws ClassNotFoundException on compilation problems
      */
     protected Map<String /*name*/, byte[] /*bytecode*/>

janino/src/org/codehaus/janino/Parser.java

@@ -1892,8 +1892,8 @@ class InterfaceDeclarationContext extends Enumerator {
      *     ConditionalExpression [ AssignmentOperator AssignmentExpression ]
      *
      *   AssignmentOperator :=
-     *     '=' | '*=' | '/=' | '%=' | '+=' | '-=' | '<<=' |
-     *     '>>=' | '>>>=' | '&=' | '^=' | '|='
+     *     '=' | '*=' | '/=' | '%=' | '+=' | '-=' | '&lt;&lt;=' |
+     *     '&gt;&gt;=' | '&gt;&gt;&gt;=' | '&amp;=' | '^=' | '|='
      * </pre>
      */
     public Atom
@@ -1954,7 +1954,7 @@ class InterfaceDeclarationContext extends Enumerator {
     /**
      * <pre>
      *   ConditionalAndExpression :=
-     *     InclusiveOrExpression { '&&' InclusiveOrExpression }
+     *     InclusiveOrExpression { '&amp;&amp;' InclusiveOrExpression }
      * </pre>
      */
     public Atom
@@ -2017,7 +2017,7 @@ class InterfaceDeclarationContext extends Enumerator {
     /**
      * <pre>
      *   AndExpression :=
-     *     EqualityExpression { '&' EqualityExpression }
+     *     EqualityExpression { '&amp;' EqualityExpression }
      * </pre>
      */
     public Atom
@@ -2061,9 +2061,9 @@ class InterfaceDeclarationContext extends Enumerator {
      *   RelationalExpression :=
      *     ShiftExpression {
      *       'instanceof' ReferenceType
-     *       | '<' ShiftExpression [ { ',' TypeArgument } '>' ]
-     *       | '<' TypeArgument [ { ',' TypeArgument } '>' ]
-     *       | ( '>' | '<=' | '>=' ) ShiftExpression
+     *       | '&lt;' ShiftExpression [ { ',' TypeArgument } '&gt;' ]
+     *       | '&lt;' TypeArgument [ { ',' TypeArgument } '&gt;' ]
+     *       | ( '&gt;' | '&lt;=' | '&gt;=' ) ShiftExpression
      *     }
      * </pre>
      */
@@ -2161,7 +2161,7 @@ class InterfaceDeclarationContext extends Enumerator {
     /**
      * <pre>
      *   ShiftExpression :=
-     *     AdditiveExpression { ( '<<' | '>>' | '>>>' ) AdditiveExpression }
+     *     AdditiveExpression { ( '&lt;&lt;' | '&gt;&gt;' | '&gt;&gt;&gt;' ) AdditiveExpression }
      * </pre>
      */
     public Atom

janino/src/org/codehaus/janino/Scanner.java

@@ -238,7 +238,7 @@ class Scanner {
      * of future calls to {@link #produce()} are undefined.
      *
      * @deprecated This method is deprecated, because the concept described above is confusing. An application should
-     *             close the underlying {@link InputStream} or {@link Reader} itself.</b>
+     *             close the underlying {@link InputStream} or {@link Reader} itself
      */
     @Deprecated public void
     close() throws IOException { this.in.close(); }
@@ -311,7 +311,10 @@ class Token {
         /** The token represents the {@code null} literal; its {@link #value} is 'null'. */
         public static final int NULL_LITERAL = 8;
 
-        /** The token represents an operator; its {@link #value} is exactly the particular operator (e.g. "<<<="). */
+        /**
+         * The token represents an operator; its {@link #value} is exactly the particular operator (e.g.
+         * "&lt;&lt;&lt;=").
+         */
         public static final int OPERATOR = 9;
 
         /** The text of the token exactly as it appears in the source code. */