From 82064760d532196a8df604e84772813615ddb737 Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 27 Jan 2017 02:19:47 +0000 Subject: [PATCH] javadoc fixes part 11 (ticket #1894) --- .../net/i2p/i2ptunnel/I2PTunnelConnectClient.java | 2 +- .../net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java | 4 ++-- .../src/net/i2p/i2ptunnel/irc/DCCClientManager.java | 10 +++++----- .../net/i2p/i2ptunnel/irc/I2PTunnelDCCServer.java | 10 +++++----- .../src/net/i2p/i2ptunnel/socks/SOCKSUDPPort.java | 4 ++-- .../src/net/i2p/i2ptunnel/socks/SOCKSUDPTunnel.java | 4 ++-- .../java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java | 2 +- .../java/src/net/i2p/i2ptunnel/web/EditBean.java | 2 +- .../java/src/net/i2p/i2ptunnel/web/Messages.java | 2 +- .../java/src/net/i2p/router/web/FormHandler.java | 12 ++++++------ .../java/src/net/i2p/router/web/HelperBase.java | 2 +- .../java/src/net/i2p/router/web/Messages.java | 2 +- .../src/net/i2p/client/streaming/impl/Packet.java | 2 +- 13 files changed, 29 insertions(+), 29 deletions(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java index 619e5d44a..37c906fbe 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java @@ -49,7 +49,7 @@ import net.i2p.util.PortMapper; *
  *  INTERNET-DRAFT                                              Ari Luotonen
  *  Expires: September 26, 1997          Netscape Communications Corporation
- *                       March 26, 1997
+ *  draft-luotonen-ssl-tunneling-03.txt                       March 26, 1997
  *                     Tunneling SSL Through a WWW Proxy
  *
* diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java index 4908042dd..354f5e816 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java @@ -486,7 +486,7 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem //////// Error page stuff /** - * foo => errordir/foo-header_xx.ht for lang xx, or errordir/foo-header.ht, + * foo => errordir/foo-header_xx.ht for lang xx, or errordir/foo-header.ht, * or the backup byte array on fail. * * .ht files must be UTF-8 encoded and use \r\n terminators so the @@ -501,7 +501,7 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem } /** - * foo => errordir/foo-header_xx.ht for lang xx, or errordir/foo-header.ht, + * foo => errordir/foo-header_xx.ht for lang xx, or errordir/foo-header.ht, * or the backup byte array on fail. * * .ht files must be UTF-8 encoded and use \r\n terminators so the diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/DCCClientManager.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/DCCClientManager.java index 753da65ec..e5a96b488 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/DCCClientManager.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/DCCClientManager.java @@ -17,13 +17,13 @@ import net.i2p.util.Log; *
  *
  *                                            direct conn
- *                <---> I2PTunnelDCCServer <--------------->I2PTunnelDCCClient <---->
+ *                <---> I2PTunnelDCCServer <--------------->I2PTunnelDCCClient <---->
  *   originating                                                                     responding
  *   chat client                                                                     chat client
- *        CHAT    ---> I2PTunnelIRCClient --> IRC server --> I2TunnelIRCClient ----->
- *        SEND    ---> I2PTunnelIRCClient --> IRC server --> I2TunnelIRCClient ----->
- *        RESUME  <--- I2PTunnelIRCClient <-- IRC server <-- I2TunnelIRCClient <-----
- *        ACCEPT  ---> I2PTunnelIRCClient --> IRC server --> I2TunnelIRCClient ----->
+ *        CHAT    ---> I2PTunnelIRCClient --> IRC server --> I2TunnelIRCClient ----->
+ *        SEND    ---> I2PTunnelIRCClient --> IRC server --> I2TunnelIRCClient ----->
+ *        RESUME  <--- I2PTunnelIRCClient <-- IRC server <-- I2TunnelIRCClient <-----
+ *        ACCEPT  ---> I2PTunnelIRCClient --> IRC server --> I2TunnelIRCClient ----->
  *
  * 
* diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/I2PTunnelDCCServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/I2PTunnelDCCServer.java index cab6513ad..8010a110f 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/I2PTunnelDCCServer.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/I2PTunnelDCCServer.java @@ -27,13 +27,13 @@ import net.i2p.util.Log; *
  *
  *                                            direct conn
- *                <---> I2PTunnelDCCServer <--------------->I2PTunnelDCCClient <---->
+ *                <---> I2PTunnelDCCServer <--------------->I2PTunnelDCCClient <---->
  *   originating                                                                     responding
  *   chat client                                                                     chat client
- *        CHAT    ---> I2PTunnelIRCClient --> IRC server --> I2TunnelIRCClient ----->
- *        SEND    ---> I2PTunnelIRCClient --> IRC server --> I2TunnelIRCClient ----->
- *        RESUME  <--- I2PTunnelIRCClient <-- IRC server <-- I2TunnelIRCClient <-----
- *        ACCEPT  ---> I2PTunnelIRCClient --> IRC server --> I2TunnelIRCClient ----->
+ *        CHAT    ---> I2PTunnelIRCClient --> IRC server --> I2TunnelIRCClient ----->
+ *        SEND    ---> I2PTunnelIRCClient --> IRC server --> I2TunnelIRCClient ----->
+ *        RESUME  <--- I2PTunnelIRCClient <-- IRC server <-- I2TunnelIRCClient <-----
+ *        ACCEPT  ---> I2PTunnelIRCClient --> IRC server --> I2TunnelIRCClient ----->
  *
  * 
* diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSUDPPort.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSUDPPort.java index 2064d698b..773a4c04b 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSUDPPort.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSUDPPort.java @@ -14,10 +14,10 @@ import net.i2p.i2ptunnel.udp.*; * ports, it happens outside of here. * * TX: - * UDPSource -> SOCKSUDPUnwrapper -> ReplyTracker ( -> I2PSink in SOCKSUDPTunnel) + * UDPSource -> SOCKSUDPUnwrapper -> ReplyTracker ( -> I2PSink in SOCKSUDPTunnel) * * RX: - * UDPSink <- SOCKSUDPWrapper ( <- MultiSink <- I2PSource in SOCKSUDPTunnel) + * UDPSink <- SOCKSUDPWrapper ( <- MultiSink <- I2PSource in SOCKSUDPTunnel) * * The Unwrapper passes headers to the Wrapper through a cache. * The ReplyTracker passes sinks to MultiSink through a cache. diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSUDPTunnel.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSUDPTunnel.java index 044b00057..23e7090d7 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSUDPTunnel.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSUDPTunnel.java @@ -12,10 +12,10 @@ import net.i2p.i2ptunnel.udpTunnel.I2PTunnelUDPClientBase; * A Datagram Tunnel that can have multiple bidirectional ports on the UDP side. * * TX: - * (ReplyTracker in multiple SOCKSUDPPorts -> ) I2PSink + * (ReplyTracker in multiple SOCKSUDPPorts -> ) I2PSink * * RX: - * (SOCKSUDPWrapper in multiple SOCKSUDPPorts <- ) MultiSink <- I2PSource + * (SOCKSUDPWrapper in multiple SOCKSUDPPorts <- ) MultiSink <- I2PSource * * The reply from a dest goes to the last SOCKSUDPPort that sent to that dest. * If multiple ports are talking to a dest at the same time, this isn't diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java index 4ebf3f4d4..556982a43 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java @@ -425,7 +425,7 @@ public class GeneralHelper { } /** - * @param newTunnelType used if tunnel < 0 + * @param newTunnelType used if tunnel < 0 */ public int getSigType(int tunnel, String newTunnelType) { SigType type; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java index 8619c6ceb..f252faade 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java @@ -183,7 +183,7 @@ public class EditBean extends IndexBean { } /** - * @param newTunnelType used if tunnel < 0 + * @param newTunnelType used if tunnel < 0 * @since 0.9.12 */ public int getSigType(int tunnel, String newTunnelType) { diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/Messages.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/Messages.java index 1ae4636a1..6aba5d4b1 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/Messages.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/Messages.java @@ -30,7 +30,7 @@ public class Messages { * * @param s string to be translated containing {0} * The {0} will be replaced by the parameter. - * Single quotes must be doubled, i.e. ' -> '' in the string. + * Single quotes must be doubled, i.e. ' -> '' in the string. * @param o parameter, not translated. * To translate parameter also, use _t("foo {0} bar", _t("baz")) * Do not double the single quotes in the parameter. diff --git a/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java index dfec5d9cb..097c5506b 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java @@ -13,7 +13,7 @@ import net.i2p.util.Log; /** * Simple form handler base class - does not depend on servlets or jsp, * but instead the subclasses are populated with javabean properties. e.g. - * + * <jsp:setProperty name="handler" property="*" /> * * The form is "processed" after the properties are set and the first output * property is retrieved - either getAll(), getNotices() or getErrors(). @@ -126,7 +126,7 @@ public abstract class FormHandler { /** * Add an error message to display * Use if it does not include a link. - * Escapes '<' and '>' before queueing + * Escapes '<' and '>' before queueing */ protected void addFormError(String errorMsg) { if (errorMsg == null) return; @@ -136,7 +136,7 @@ public abstract class FormHandler { /** * Add a non-error message to display * Use if it does not include a link. - * Escapes '<' and '>' before queueing + * Escapes '<' and '>' before queueing */ protected void addFormNotice(String msg) { if (msg == null) return; @@ -146,7 +146,7 @@ public abstract class FormHandler { /** * Add a non-error message to display * Use if it includes a link or other formatting. - * Does not escape '<' and '>' before queueing + * Does not escape '<' and '>' before queueing * @since 0.9.14.1 */ protected void addFormNoticeNoEscape(String msg) { @@ -157,7 +157,7 @@ public abstract class FormHandler { /** * Add an error message to display * Use if it includes a link or other formatting. - * Does not escape '<' and '>' before queueing + * Does not escape '<' and '>' before queueing * @since 0.9.19 */ protected void addFormErrorNoEscape(String msg) { @@ -303,7 +303,7 @@ public abstract class FormHandler { * * @param s string to be translated containing {0} * The {0} will be replaced by the parameter. - * Single quotes must be doubled, i.e. ' -> '' in the string. + * Single quotes must be doubled, i.e. ' -> '' in the string. * @param o parameter, not translated. * To translate parameter also, use _t("foo {0} bar", _t("baz")) * Do not double the single quotes in the parameter. diff --git a/apps/routerconsole/java/src/net/i2p/router/web/HelperBase.java b/apps/routerconsole/java/src/net/i2p/router/web/HelperBase.java index 12e2a173b..b6e710544 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/HelperBase.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/HelperBase.java @@ -68,7 +68,7 @@ public abstract class HelperBase { * * @param s string to be translated containing {0} * The {0} will be replaced by the parameter. - * Single quotes must be doubled, i.e. ' -> '' in the string. + * Single quotes must be doubled, i.e. ' -> '' in the string. * @param o parameter, not translated. * To translate parameter also, use _t("foo {0} bar", _t("baz")) * Do not double the single quotes in the parameter. diff --git a/apps/routerconsole/java/src/net/i2p/router/web/Messages.java b/apps/routerconsole/java/src/net/i2p/router/web/Messages.java index ad3543085..196bc6ab8 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/Messages.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/Messages.java @@ -22,7 +22,7 @@ public class Messages extends Translate { * * @param s string to be translated containing {0} * The {0} will be replaced by the parameter. - * Single quotes must be doubled, i.e. ' -> '' in the string. + * Single quotes must be doubled, i.e. ' -> '' in the string. * @param o parameter, not translated. * To translate parameter also, use _t("foo {0} bar", _t("baz")) * Do not double the single quotes in the parameter. diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/Packet.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/Packet.java index b9b739702..65ebe4f1f 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/Packet.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/Packet.java @@ -259,7 +259,7 @@ class Packet { * Not to be used without sanitizing for huge values. * Setters from options did not divide by 1000, and the options default * is 1000, so the value sent in the 1-byte field was always - * 1000 & 0xff = 0xe8 = 232 + * 1000 & 0xff = 0xe8 = 232 * * @return Delay before resending a packet in seconds. */