diff --git a/apps/routerconsole/java/src/edu/internet2/ndt/OsfwWorker.java b/apps/routerconsole/java/src/edu/internet2/ndt/OsfwWorker.java
index c9d1f11bf0889a76e9a2f1db2a7b5e02babbf97c..2eb4bbf98a7373809e70cd780b1808a63ec58bfb 100644
--- a/apps/routerconsole/java/src/edu/internet2/ndt/OsfwWorker.java
+++ b/apps/routerconsole/java/src/edu/internet2/ndt/OsfwWorker.java
@@ -7,7 +7,7 @@ import java.net.Socket;
/**
* OsfwWorker creates a thread that listens for a message from the server. It
* functions to check if the server has sent a message that is valid and
- * sufficient to determine if the server->client direction has a fire-wall.
+ * sufficient to determine if the server->client direction has a fire-wall.
*
* <p>
* As part of the simple firewall test, the Server must try to connect to the
@@ -49,7 +49,7 @@ public class OsfwWorker implements Runnable {
* @param iParamTestTime
* Test time duration to wait for message from server
* @param _localParam
- * Applet object used to set the result of the S->C firewall test
+ * Applet object used to set the result of the S->C firewall test
*/
OsfwWorker(ServerSocket srvSocketParam, int iParamTestTime,
Tcpbw100 _localParam) {
@@ -76,7 +76,7 @@ public class OsfwWorker implements Runnable {
/**
* run() method of this SFW Worker thread. This thread listens on the socket
* from the server for a given time period, and checks to see if the server
- * has sent a message that is valid and sufficient to determine if the S->C
+ * has sent a message that is valid and sufficient to determine if the S->C
* direction has a fire-wall.
* */
public void run() {
diff --git a/apps/routerconsole/java/src/edu/internet2/ndt/Tcpbw100.java b/apps/routerconsole/java/src/edu/internet2/ndt/Tcpbw100.java
index 6812fa6e2c4b21a507f2ab529f9a2f2fd1aece2f..e3100b76cfe596a57e467732d4a71341d9ae9d5f 100644
--- a/apps/routerconsole/java/src/edu/internet2/ndt/Tcpbw100.java
+++ b/apps/routerconsole/java/src/edu/internet2/ndt/Tcpbw100.java
@@ -563,38 +563,38 @@ public class Tcpbw100 extends JApplet implements ActionListener {
}
/**
- * Get Client->Server fire-wall test results.
+ * Get Client->Server fire-wall test results.
*
- * @return integer indicating C->S test results
+ * @return integer indicating C->S test results
* */
public int getC2sSFWTestResults() {
return this._iC2sSFWResult;
}
/**
- * Set Client->Server fire-wall test results.
+ * Set Client->Server fire-wall test results.
*
* @param iParamC2SRes
- * integer indicating C->S test results
+ * integer indicating C->S test results
* */
public void setC2sSFWTestResults(int iParamC2SRes) {
this._iC2sSFWResult = iParamC2SRes;
}
/**
- * Get Server->Client fire-wall test results.
+ * Get Server->Client fire-wall test results.
*
- * @return integer indicating C->S test results
+ * @return integer indicating C->S test results
* */
public int getS2cSFWTestResults() {
return this._iS2cSFWResult;
}
/**
- * Set server->Client fire-wall test results.
+ * Set server->Client fire-wall test results.
*
* @param iParamS2CRes
- * integer indicating C->S test results
+ * integer indicating C->S test results
* */
public void setS2cSFWTestResults(int iParamS2CRes) {
this._iS2cSFWResult = iParamS2CRes;
@@ -4548,7 +4548,7 @@ public class Tcpbw100 extends JApplet implements ActionListener {
try {
t.interrupt();
} catch (RuntimeException re) {
- _log.warn("TG", re);
+ _log.debug("TG", re);
}
try {
Thread.sleep(20);
@@ -4559,7 +4559,7 @@ public class Tcpbw100 extends JApplet implements ActionListener {
try {
t.stop();
} catch (RuntimeException re) {
- _log.warn("TG", re);
+ _log.debug("TG", re);
}
}
}
@@ -4571,7 +4571,7 @@ public class Tcpbw100 extends JApplet implements ActionListener {
thread_group.destroy();
break;
}catch( Throwable e ){
- _log.warn("TG", e);
+ _log.debug("TG", e);
}
}
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PServerSocketFull.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PServerSocketFull.java
index 28b615370e203b7dda65522c887c1edb62fd8860..f5595182fb781dac6d87e4abea3895add3e58693 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PServerSocketFull.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PServerSocketFull.java
@@ -30,7 +30,7 @@ class I2PServerSocketFull implements I2PServerSocket {
*
* @throws I2PException if there is a problem with reading a new socket
* from the data available (e.g. the I2PSession is closed)
- * @throws RouterRestartException (extends I2PException) if the router is apparently restarting, since 0.9.34
+ * @throws net.i2p.client.streaming.RouterRestartException (extends I2PException) if the router is apparently restarting, since 0.9.34
* @throws ConnectException if the I2PServerSocket is closed, or if interrupted.
* Not actually thrown through 0.9.16; thrown as of 0.9.17
* @throws SocketTimeoutException if a timeout was previously set with setSoTimeout and the timeout has been reached.
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java
index 66ca1b491a1e1ab76f741a8148cc06b2520df7e1..48d125e7720436af316e5024851e9f65066e2d41 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java
@@ -350,7 +350,7 @@ public class I2PSocketManagerFull implements I2PSocketManager {
*
* @return connected I2PSocket, or null through 0.9.16, non-null as of 0.9.17
* @throws I2PException if session is closed
- * @throws RouterRestartException (extends I2PException) if the router is apparently restarting, since 0.9.34
+ * @throws net.i2p.client.streaming.RouterRestartException (extends I2PException) if the router is apparently restarting, since 0.9.34
* @throws ConnectException (since 0.9.17; I2PServerSocket interface always declared it)
* @throws SocketTimeoutException if a timeout was previously set with setSoTimeout and the timeout has been reached.
*/
diff --git a/core/java/src/org/json/simple/ItemList.java b/core/java/src/org/json/simple/ItemList.java
index 3d1213a11f12d3d89cc001e5df86eafa01ee38e7..a9504f058cb1b158283b7c370d4afd3f75b65221 100644
--- a/core/java/src/org/json/simple/ItemList.java
+++ b/core/java/src/org/json/simple/ItemList.java
@@ -9,10 +9,10 @@ import java.util.List;
import java.util.StringTokenizer;
/**
- * |a:b:c| => |a|,|b|,|c|
- * |:| => ||,||
- * |a:| => |a|,||
- * @author FangYidong<fangyidong@yahoo.com.cn>
+ * |a:b:c| => |a|,|b|,|c|
+ * |:| => ||,||
+ * |a:| => |a|,||
+ * @author FangYidong fangyidong@yahoo.com.cn
*/
public class ItemList {
private String sp=",";
diff --git a/core/java/src/org/json/simple/JSONArray.java b/core/java/src/org/json/simple/JSONArray.java
index 57167f482f6ce9a2bd2af83d0ef1a5834f7d88e2..e484d9e2288ed37c653e10e55589f9c8f83fb375 100644
--- a/core/java/src/org/json/simple/JSONArray.java
+++ b/core/java/src/org/json/simple/JSONArray.java
@@ -14,7 +14,7 @@ import java.util.List;
/**
* A JSON array. JSONObject supports java.util.List interface.
*
- * @author FangYidong<fangyidong@yahoo.com.cn>
+ * @author FangYidong fangyidong@yahoo.com.cn
*/
public class JSONArray extends ArrayList implements List, JSONAware, JSONStreamAware {
private static final long serialVersionUID = 3957988303675231981L;
diff --git a/core/java/src/org/json/simple/JSONAware.java b/core/java/src/org/json/simple/JSONAware.java
index 89f152510428d03d412edb4072f2e0e589501f73..b92771113e7a9660a1bcb9d34763858e8d45ef3c 100644
--- a/core/java/src/org/json/simple/JSONAware.java
+++ b/core/java/src/org/json/simple/JSONAware.java
@@ -2,7 +2,7 @@ package org.json.simple;
/**
* Beans that support customized output of JSON text shall implement this interface.
- * @author FangYidong<fangyidong@yahoo.com.cn>
+ * @author FangYidong fangyidong@yahoo.com.cn
*/
public interface JSONAware {
/**
diff --git a/core/java/src/org/json/simple/JSONObject.java b/core/java/src/org/json/simple/JSONObject.java
index e1dbf266cef3de18bb9d510e19d9de3726b1a8c3..60eeecbb2c18865313b0d85553700469e2e0b0fe 100644
--- a/core/java/src/org/json/simple/JSONObject.java
+++ b/core/java/src/org/json/simple/JSONObject.java
@@ -13,7 +13,7 @@ import java.util.Map;
/**
* A JSON object. Key value pairs are unordered. JSONObject supports java.util.Map interface.
*
- * @author FangYidong<fangyidong@yahoo.com.cn>
+ * @author FangYidong fangyidong@yahoo.com.cn
*/
public class JSONObject extends HashMap implements Map, JSONAware, JSONStreamAware{
diff --git a/core/java/src/org/json/simple/JSONStreamAware.java b/core/java/src/org/json/simple/JSONStreamAware.java
index c2287c459e8b62de34ff78b4b8f4db3212f2e7e7..29e3ce9bfa6b3c920cd3cab87b22cc655e944d87 100644
--- a/core/java/src/org/json/simple/JSONStreamAware.java
+++ b/core/java/src/org/json/simple/JSONStreamAware.java
@@ -5,7 +5,7 @@ import java.io.Writer;
/**
* Beans that support customized output of JSON text to a writer shall implement this interface.
- * @author FangYidong<fangyidong@yahoo.com.cn>
+ * @author FangYidong fangyidong@yahoo.com.cn
*/
public interface JSONStreamAware {
/**
diff --git a/core/java/src/org/json/simple/JSONValue.java b/core/java/src/org/json/simple/JSONValue.java
index fc9fab254d3ed75c6b4d52b288ea739aaa202340..a236401b721adc0c275a0dd5212f172dc236066a 100644
--- a/core/java/src/org/json/simple/JSONValue.java
+++ b/core/java/src/org/json/simple/JSONValue.java
@@ -16,7 +16,7 @@ import org.json.simple.parser.ParseException;
/**
- * @author FangYidong<fangyidong@yahoo.com.cn>
+ * @author FangYidong fangyidong@yahoo.com.cn
*/
public class JSONValue {
/**
diff --git a/core/java/src/org/json/simple/parser/ContainerFactory.java b/core/java/src/org/json/simple/parser/ContainerFactory.java
index 366ac4dead5867e14b01206b62b9640112d5b6ba..5ff4ce1727ca1ddcc64ac02ab5a2c0a17c43a4d1 100644
--- a/core/java/src/org/json/simple/parser/ContainerFactory.java
+++ b/core/java/src/org/json/simple/parser/ContainerFactory.java
@@ -8,7 +8,7 @@ import java.util.Map;
*
* @see org.json.simple.parser.JSONParser#parse(java.io.Reader, ContainerFactory)
*
- * @author FangYidong<fangyidong@yahoo.com.cn>
+ * @author FangYidong fangyidong@yahoo.com.cn
*/
public interface ContainerFactory {
/**
diff --git a/core/java/src/org/json/simple/parser/ContentHandler.java b/core/java/src/org/json/simple/parser/ContentHandler.java
index ae8d065579bb6b1ca9b086a0ee6980afec6b2752..36dcfd7bf8de2cabb768034581efa10cd83d492d 100644
--- a/core/java/src/org/json/simple/parser/ContentHandler.java
+++ b/core/java/src/org/json/simple/parser/ContentHandler.java
@@ -8,7 +8,7 @@ import java.io.IOException;
* @see org.xml.sax.ContentHandler
* @see org.json.simple.parser.JSONParser#parse(java.io.Reader, ContentHandler, boolean)
*
- * @author FangYidong<fangyidong@yahoo.com.cn>
+ * @author FangYidong fangyidong@yahoo.com.cn
*/
public interface ContentHandler {
/**
diff --git a/core/java/src/org/json/simple/parser/JSONParser.java b/core/java/src/org/json/simple/parser/JSONParser.java
index 9acaa377fed6cd4db7a802cefcc7a8cef42a49c9..a32d81cc00860322cca7ed559ea6313ef13ad314 100644
--- a/core/java/src/org/json/simple/parser/JSONParser.java
+++ b/core/java/src/org/json/simple/parser/JSONParser.java
@@ -18,7 +18,7 @@ import org.json.simple.JSONObject;
/**
* Parser for JSON text. Please note that JSONParser is NOT thread-safe.
*
- * @author FangYidong<fangyidong@yahoo.com.cn>
+ * @author FangYidong fangyidong@yahoo.com.cn
*/
public class JSONParser {
public static final int S_INIT=0;
@@ -56,8 +56,6 @@ public class JSONParser {
* Reset the parser to the initial state with a new character reader.
*
* @param in - The new character reader.
- * @throws IOException
- * @throws ParseException
*/
public void reset(Reader in){
lexer.yyreset(in);
diff --git a/core/java/src/org/json/simple/parser/ParseException.java b/core/java/src/org/json/simple/parser/ParseException.java
index f497cd9f89e715b6e3f7d4ab8f8d3c89aa4c5001..39f95f61608a4557e50b73b12b13ed1f68410097 100644
--- a/core/java/src/org/json/simple/parser/ParseException.java
+++ b/core/java/src/org/json/simple/parser/ParseException.java
@@ -3,7 +3,7 @@ package org.json.simple.parser;
/**
* ParseException explains why and where the error occurs in source JSON text.
*
- * @author FangYidong<fangyidong@yahoo.com.cn>
+ * @author FangYidong fangyidong@yahoo.com.cn
*
*/
public class ParseException extends Exception {
diff --git a/core/java/src/org/json/simple/parser/Yytoken.java b/core/java/src/org/json/simple/parser/Yytoken.java
index ff14e27c1be0c963cabdafec8350e65b06066c70..c8b3ca7e2604b8929888551aefa52d4ca838bb36 100644
--- a/core/java/src/org/json/simple/parser/Yytoken.java
+++ b/core/java/src/org/json/simple/parser/Yytoken.java
@@ -5,7 +5,7 @@
package org.json.simple.parser;
/**
- * @author FangYidong<fangyidong@yahoo.com.cn>
+ * @author FangYidong fangyidong@yahoo.com.cn
*/
public class Yytoken {
public static final int TYPE_VALUE=0;//JSON primitive value: string,number,boolean,null