From f461d4881deade46c0c1bb2e7fc8b401c53da685 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 3 Dec 2016 14:27:50 +0000
Subject: [PATCH] javadoc fixes
---
build.properties | 1 -
build.xml | 1 -
core/java/src/net/i2p/crypto/SHA256Generator.java | 4 ++--
installer/resources/package-lists/jrobin/package-list | 2 --
router/java/src/net/i2p/router/util/MaskedIPSet.java | 3 ---
5 files changed, 2 insertions(+), 9 deletions(-)
delete mode 100644 installer/resources/package-lists/jrobin/package-list
diff --git a/build.properties b/build.properties
index 0705cd9d15..822d9c0972 100644
--- a/build.properties
+++ b/build.properties
@@ -15,7 +15,6 @@ javaeedocs.url=http://docs.oracle.com/javaee/7/api/
# perhaps not, as they move 7 and 8 to unsupported status.
#jettydocs.url=http://download.eclipse.org/jetty/stable-8/apidocs/
jettydocs.url=http://download.eclipse.org/jetty/8.1.17.v20150415/apidocs/
-jrobindocs.url=http://docs.i2p-projekt.de/jrobin/javadoc/
wrapperdocs.url=http://wrapper.tanukisoftware.com/jdoc/
# these are only for unit test javadocs
i2pdocs.url=http://docs.i2p-projekt.de/javadoc/
diff --git a/build.xml b/build.xml
index 750db1ad0a..00773bd719 100644
--- a/build.xml
+++ b/build.xml
@@ -783,7 +783,6 @@
<link offline="true" href="${javasedocs.url}" packagelistLoc="installer/resources/package-lists/java/" />
<link offline="true" href="${javaeedocs.url}" packagelistLoc="installer/resources/package-lists/javaee/" />
<link offline="true" href="${jettydocs.url}" packagelistLoc="installer/resources/package-lists/jetty/" />
- <link offline="true" href="${jrobindocs.url}" packagelistLoc="installer/resources/package-lists/jrobin/" />
<link offline="true" href="${wrapperdocs.url}" packagelistLoc="installer/resources/package-lists/wrapper/" />
</javadoc>
<echo message="Warning, javadoc embeds timestamps in the output, run with 'TZ=UTC ant javadoc' if you plan to distribute" />
diff --git a/core/java/src/net/i2p/crypto/SHA256Generator.java b/core/java/src/net/i2p/crypto/SHA256Generator.java
index e3facad9e4..a03878c2f0 100644
--- a/core/java/src/net/i2p/crypto/SHA256Generator.java
+++ b/core/java/src/net/i2p/crypto/SHA256Generator.java
@@ -13,8 +13,8 @@ import net.i2p.data.Hash;
*
* As of release 0.8.7, uses java.security.MessageDigest by default.
* As of release 0.9.25, uses only MessageDigest.
- * GNU-Crypto {@link gnu.crypto.hash.Sha256Standalone}
- * is deprecated.
+ * GNU-Crypto gnu.crypto.hash.Sha256Standalone
+ * is removed as of 0.9.28.
*/
public final class SHA256Generator {
private final LinkedBlockingQueue<MessageDigest> _digests;
diff --git a/installer/resources/package-lists/jrobin/package-list b/installer/resources/package-lists/jrobin/package-list
deleted file mode 100644
index 35d275684c..0000000000
--- a/installer/resources/package-lists/jrobin/package-list
+++ /dev/null
@@ -1,2 +0,0 @@
-org.jrobin.core
-org.jrobin.graph
diff --git a/router/java/src/net/i2p/router/util/MaskedIPSet.java b/router/java/src/net/i2p/router/util/MaskedIPSet.java
index 96f18d30aa..04c94a28d5 100644
--- a/router/java/src/net/i2p/router/util/MaskedIPSet.java
+++ b/router/java/src/net/i2p/router/util/MaskedIPSet.java
@@ -34,7 +34,6 @@ public class MaskedIPSet extends HashSet<String> {
*
* @param peer non-null
* @param mask is 1-4 (number of bytes to match)
- * @return an opaque set of masked IPs for this peer
*/
public MaskedIPSet(RouterContext ctx, Hash peer, int mask) {
this(ctx, peer, ctx.netDb().lookupRouterInfoLocally(peer), mask);
@@ -48,7 +47,6 @@ public class MaskedIPSet extends HashSet<String> {
*
* @param pinfo may be null
* @param mask is 1-4 (number of bytes to match)
- * @return an opaque set of masked IPs for this peer
*/
public MaskedIPSet(RouterContext ctx, RouterInfo pinfo, int mask) {
this(ctx, pinfo != null ? pinfo.getHash() : null, pinfo, mask);
@@ -62,7 +60,6 @@ public class MaskedIPSet extends HashSet<String> {
*
* @param pinfo may be null
* @param mask is 1-4 (number of bytes to match)
- * @return an opaque set of masked IPs for this peer
*/
public MaskedIPSet(RouterContext ctx, Hash peer, RouterInfo pinfo, int mask) {
super(4);
--
GitLab