From 232b7f30d53b7db11ecb7b00c749ddfa8f56633f Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 19 Aug 2019 16:33:19 +0000
Subject: [PATCH] Build: Fix javadoc errors with Oracle JDK Tested with 12.0.2

---
 .../java/src/net/metanotion/package.html      | 21 +++++++++----------
 core/java/src/gnu/getopt/package.html         |  2 +-
 core/java/src/net/i2p/app/package.html        |  2 +-
 .../src/net/i2p/crypto/elgamal/package.html   |  4 ++--
 .../src/org/json/simple/parser/Yylex.java     |  4 ++--
 .../java/src/net/i2p/router/app/package.html  |  2 +-
 .../router/transport/udp/PacketBuilder.java   |  2 +-
 .../upnp/ssdp/SSDPNotifySocketList.java       |  2 +-
 .../ssdp/SSDPSearchResponseSocketList.java    |  2 +-
 .../org/cybergarage/upnp/xml/DeviceData.java  |  4 ++--
 10 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/apps/addressbook/java/src/net/metanotion/package.html b/apps/addressbook/java/src/net/metanotion/package.html
index 68fe923e59..45c7447064 100644
--- a/apps/addressbook/java/src/net/metanotion/package.html
+++ b/apps/addressbook/java/src/net/metanotion/package.html
@@ -32,18 +32,18 @@ Following is the original documentation copied from metanotion website.
 			<li><a href="#download">Download</a></li>
 		</ul>
 		
-		<a name="features"><h2>Features</h2></a>
+		<h2 id="features">Features</h2>
 		<ul>
 			<li>100% Java 1.3. No JNI.</li>
 			<li>Will work with any "file" as long as you can approximate something like <a href="http://java.sun.com/j2se/1.3/docs/api/java/io/RandomAccessFile.html">java.io.RandomAccessFile</a>, you can use this.</li>
-			<li>BSD Licensed. Yes, this means you can use it for free in a commercial project. However, if you base some really cool mobile technology startup on this code we'll gladly accept stock options...</p>
+			<li>BSD Licensed. Yes, this means you can use it for free in a commercial project. However, if you base some really cool mobile technology startup on this code we'll gladly accept stock options...</li>
 			<li>No dependence on file API's(useful for mobile apps)</li>
 			<li>Small. 32KB in a JAR file. &lt;2000 lines of code.</li>
 			<li>Reasonably fast. This is used in an app running on a sub 200MHz StrongARM PocketPC, and quite handily deals with 70,000 records. The load time is a little slow, but its been tested with a <a href="http://java.sun.com/javame/reference/apis.jsp">CDC 1.0/Personal Profile</a> device.
 			</li>
 		</ul>
 
-		<a name="unfeatures"><h2>Unfeatures</h2></a>
+		<h2 id="unfeatures">Unfeatures</h2>
 		<p>A good, ACID database is a nice thing to work with. Unfortunately, in the goal to make this small, fast, and work with minimal dependencies, something had to give. So I list things which this database will likely never have. Of course, since it is BSD Licensed, patches welcome...</p>
 		
 		<ul>
@@ -53,11 +53,11 @@ Following is the original documentation copied from metanotion website.
 			<li>No use of reflection or automagical serialization tricks.</li>
 		</ul>
 
-		<a name="future"><h2>Future Plans</h2></a>
+		<h2 id="future">Future Plans</h2>
 		<p>There are still bugs(none known...). The app that this was written for is still in testing, but we should most of the issues sorted by the time we deploy it in a few weeks(early November, 2006). Some loading speed issues on large record sets, and memory usage could still be improved. All this and feedback from other uses will direct this products evolution.</p>
 		<p>What is currently up here is not "1.0" code, but we will release a labeled "1.0" version once we feel happy with the state of the codebase.</p>
 	
-		<a name="design"><h2>What KIND of database is this?</h2></a>
+		<h2 id="design">What KIND of database is this?</h2>
 		<p>You probably store at least part of your application data in memory in a class from the <a href="http://java.sun.com/j2se/1.4.2/docs/guide/collections/">Java Collections Framework</a>. The BlockFile database stores data in a <a href="http://en.wikipedia.org/wiki/Skip_list">Skip</a> <a href="http://eternallyconfuzzled.com/tuts/skip.html">List</a> that almost implements <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/SortedMap.html">java.util.SortedMap</a>. You can create and store as many named(with a string) SkipList in the database as you want.</p>
 		<p>To serialize your data, you have to either extend our SerialStreams class or implement our Serializer interface. We could have done something cool and fancy with reflection(and other cool stuff with Java 1.5), but that would probably not do the Right Thing&trade; most of the time.  As you can see, there's not a lot to it anyway:</p>
 		<h3>net.metanotion.io.SerialStreams</h3>
@@ -91,9 +91,8 @@ public class SkipList {
 	public ListIterator find(Comparable key) ...
 }
 </pre>
-</p>
 
-		<a name="examples"><h2>Examples</h2></a>
+		<h2 id="examples">Examples</h2>
 		<p>Better documentation is forthcoming, but there really isn't much to know. The entire public interface to the library is on this page. Where possible, it sticks to idiomatic Java and standard interfaces.</p>
 		<ul>
 			<li>Open a database:
@@ -146,8 +145,8 @@ public class BlockFile implements Closeable {
 		
 		<p>So, in other words, if you can provide an implementation of this interface, you can use the BlockFile database. This frees it from dependence on the RandomAccessFile class. If you don't see why this is useful and you're going to be using "files" on PDA's and phone's, well, you'll understand soon enough...</p>
 
-		<a name="download"><h2>Download</h2></a>
-		<h3>Bugfix and cleanup Release 10/6/2006</h2>
+		<h2 id="download">Download</h2>
+		<h3>Bugfix and cleanup Release 10/6/2006</h3>
 		<p>An unnecessary class was removed, some junk methods removed, and a couple of JDK compatability issues were fixed. The StringBytes class was switched to ASCII(from UTF-8) for better compatibility.</p>
 		<ul>
 			<li><a href="http://www.metanotion.net/software/sandbox/BlockFile.2006.10.06.jar">BlockFile binary JAR, version 0.1.1</a></li>
@@ -160,7 +159,7 @@ public class BlockFile implements Closeable {
 			<li><a href="http://www.metanotion.net/software/sandbox/BlockFile.src.2006.09.28.zip">BlockFile source code</a></li>
 		</ul>
 
-		<hr />
-		<center>&copy; 2006 <a href="http://www.metanotion.net/">Metanotion Software</a></center>
+		<hr>
+		<p>&copy; 2006 <a href="http://www.metanotion.net/">Metanotion Software</a></p>
 	</body>
 </html>
diff --git a/core/java/src/gnu/getopt/package.html b/core/java/src/gnu/getopt/package.html
index 4f7b81adc1..15f86b81e2 100644
--- a/core/java/src/gnu/getopt/package.html
+++ b/core/java/src/gnu/getopt/package.html
@@ -11,6 +11,7 @@ Copyright (c) 1998 by Aaron M. Renn (arenn@urbanophile.com),
 LGPL v2.
 </p><p>
 Changes:
+</p>
 <ul><li>
 Simplified Chinese
 MessagesBundle_chs.properties renamed to MessagesBundle_zh.properties
@@ -21,5 +22,4 @@ MessagesBundle_cht.properties renamed to MessagesBundle_zh_TW.properties
 Norwegian Bokmaal
 MessagesBundle_no.properties renamed to MessagesBundle_nb.properties
 </li></ul>
-</p>
 </body></html>
diff --git a/core/java/src/net/i2p/app/package.html b/core/java/src/net/i2p/app/package.html
index 1be4e8331e..8c1980267f 100644
--- a/core/java/src/net/i2p/app/package.html
+++ b/core/java/src/net/i2p/app/package.html
@@ -7,12 +7,12 @@ the that interface instead of being started with main().
 </p>
 <p>
 The benefits for clients using this interface:
+</p>
 <ul>
 <li>Get the current context via the constructor
 <li>Complete life cycle management by the router
 <li>Avoid the need for static references
 <li>Ability to find other clients without using static references
 </ul>
-</p>
 </body>
 </html>
diff --git a/core/java/src/net/i2p/crypto/elgamal/package.html b/core/java/src/net/i2p/crypto/elgamal/package.html
index f3fc75522d..6b3bed2f27 100644
--- a/core/java/src/net/i2p/crypto/elgamal/package.html
+++ b/core/java/src/net/i2p/crypto/elgamal/package.html
@@ -4,7 +4,7 @@
    Copied from Bouncy Castle 1.53.
 </p><p>
    Since 0.9.25.
-</p><p><pre>
+</p><pre>
 
 
 Copyright (c) 2000 - 2013 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
@@ -25,5 +25,5 @@ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-</pre></p>
+</pre>
 </body></html>
diff --git a/core/java/src/org/json/simple/parser/Yylex.java b/core/java/src/org/json/simple/parser/Yylex.java
index 42ce508eb4..11be091922 100644
--- a/core/java/src/org/json/simple/parser/Yylex.java
+++ b/core/java/src/org/json/simple/parser/Yylex.java
@@ -383,7 +383,7 @@ int getPosition(){
    *
    * All internal variables are reset, the old input stream 
    * <b>cannot</b> be reused (internal buffer is discarded and lost).
-   * Lexical state is set to <tt>ZZ_INITIAL</tt>.
+   * Lexical state is set to <code>ZZ_INITIAL</code>.
    *
    * @param reader   the new input stream 
    */
@@ -425,7 +425,7 @@ int getPosition(){
 
 
   /**
-   * Returns the character at position <tt>pos</tt> from the 
+   * Returns the character at position <code>pos</code> from the 
    * matched text. 
    * 
    * It is equivalent to yytext().charAt(pos), but faster
diff --git a/router/java/src/net/i2p/router/app/package.html b/router/java/src/net/i2p/router/app/package.html
index e35eea22f6..00de596507 100644
--- a/router/java/src/net/i2p/router/app/package.html
+++ b/router/java/src/net/i2p/router/app/package.html
@@ -7,12 +7,12 @@ the that interface instead of being started with main().
 </p>
 <p>
 The benefits for clients using this interface:
+</p>
 <ul>
 <li>Get the current context via the constructor
 <li>Complete life cycle management by the router
 <li>Avoid the need for static references
 <li>Ability to find other clients without using static references
 </ul>
-</p>
 </body>
 </html>
diff --git a/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java b/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java
index 311216056f..c594a7222b 100644
--- a/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java
+++ b/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java
@@ -51,7 +51,7 @@ and currently set to 0.  Peers using a different protocol version will
 not be able to communicate with this peer, though earlier versions not
 using this flag are.</p>
 
-<h2><a name="payload">Payload</a></h2>
+<h2 id="payload">Payload</h2>
 
 <p>Within the AES encrypted payload, there is a minimal common structure
 to the various messages - a one byte flag and a four byte sending 
diff --git a/router/java/src/org/cybergarage/upnp/ssdp/SSDPNotifySocketList.java b/router/java/src/org/cybergarage/upnp/ssdp/SSDPNotifySocketList.java
index 1ba3726a00..a594849c88 100644
--- a/router/java/src/org/cybergarage/upnp/ssdp/SSDPNotifySocketList.java
+++ b/router/java/src/org/cybergarage/upnp/ssdp/SSDPNotifySocketList.java
@@ -35,7 +35,7 @@ public class SSDPNotifySocketList extends Vector<SSDPNotifySocket>
 	
 	/**
 	 * 
-	 * @param binds The host to bind the service <tt>null</tt> means to bind to default.
+	 * @param binds The host to bind the service <code>null</code> means to bind to default.
 	 * @since 1.8
 	 */
 	public SSDPNotifySocketList(InetAddress[] binds){
diff --git a/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchResponseSocketList.java b/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchResponseSocketList.java
index 3eeb4c8a44..582aa7d7fa 100644
--- a/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchResponseSocketList.java
+++ b/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchResponseSocketList.java
@@ -36,7 +36,7 @@ public class SSDPSearchResponseSocketList extends Vector<SSDPSearchResponseSocke
 	}
 	/**
 	 * 
-	 * @param binds The host to bind.Use <tt>null</tt> for the default behavior
+	 * @param binds The host to bind.Use <code>null</code> for the default behavior
 	 */
 	public SSDPSearchResponseSocketList(InetAddress[] binds) {
 		this.binds = binds;
diff --git a/router/java/src/org/cybergarage/upnp/xml/DeviceData.java b/router/java/src/org/cybergarage/upnp/xml/DeviceData.java
index f8be8238f8..9b8d146751 100644
--- a/router/java/src/org/cybergarage/upnp/xml/DeviceData.java
+++ b/router/java/src/org/cybergarage/upnp/xml/DeviceData.java
@@ -178,7 +178,7 @@ public class DeviceData extends NodeData
 	
 	/**
 	 * 
-	 * @param inets The <tt>InetAddress</tt> that will be binded for listing this service. 
+	 * @param inets The <code>InetAddress</code> that will be binded for listing this service. 
 	 * 		Use <code>null</code> for the default behaviur. 
 	 * @see org.cybergarage.upnp.ssdp
 	 * @see org.cybergarage.upnp
@@ -191,7 +191,7 @@ public class DeviceData extends NodeData
 	
 	/**
 	 * 
-	 * @return inets The <tt>InetAddress</tt> that will be binded for this service
+	 * @return inets The <code>InetAddress</code> that will be binded for this service
 	 * 		<code>null</code> means that defulat behaviur will be used
 	 * @since 1.8
 	 */