From 1b63aa411bbbd5d08424e889f4c912952d26a6c5 Mon Sep 17 00:00:00 2001 From: z3d Date: Mon, 17 Aug 2009 14:35:18 +0000 Subject: [PATCH] Replace all
and
with
and
whilst we're in html4 transitional. --- .../org/klomp/snark/web/I2PSnarkServlet.java | 44 +++++++++--------- .../net/i2p/i2ptunnel/TunnelController.java | 38 +++++++-------- apps/i2ptunnel/jsp/editClient.jsp | 20 ++++---- apps/i2ptunnel/jsp/editServer.jsp | 20 ++++---- apps/i2ptunnel/jsp/index.jsp | 16 +++---- .../client/streaming/StreamSinkClient.java | 2 +- .../i2p/client/streaming/StreamSinkSend.java | 2 +- .../client/streaming/StreamSinkServer.java | 2 +- .../i2p/client/streaming/SchedulerDead.java | 2 +- .../crypto/TransientSessionKeyManager.java | 6 +-- router/java/src/net/i2p/router/JobQueue.java | 4 +- router/java/src/net/i2p/router/Router.java | 36 +++++++-------- router/java/src/net/i2p/router/Shitlist.java | 2 +- .../net/i2p/router/client/ClientManager.java | 18 ++++---- .../KademliaNetworkDatabaseFacade.java | 28 +++++------ .../peermanager/ProfileOrganizerRenderer.java | 6 +-- .../src/net/i2p/router/transport/UPnP.java | 2 +- .../router/transport/ntcp/NTCPTransport.java | 2 +- .../router/transport/udp/UDPTransport.java | 46 +++++++++---------- .../org/xmlpull/v1/XmlPullParserFactory.java | 2 +- .../src/org/xmlpull/v1/XmlSerializer.java | 28 +++++------ 21 files changed, 163 insertions(+), 163 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java index 4a2740358..5121a921f 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -111,9 +111,9 @@ public class I2PSnarkServlet extends HttpServlet { out.write(TABLE_HEADER); if (_manager.util().connected() && snarks.size() > 0) { if (peerParam != null) - out.write("(Hide Peers)
\n"); + out.write("(Hide Peers)
\n"); else - out.write("(Show Peers)
\n"); + out.write("(Show Peers)
\n"); } out.write(TABLE_HEADER2); out.write(""); @@ -455,7 +455,7 @@ public class I2PSnarkServlet extends HttpServlet { else { if (err.length() > MAX_DISPLAYED_ERROR_LENGTH) err = err.substring(0, MAX_DISPLAYED_ERROR_LENGTH) + "…"; - statusString = "TrackerErr
(" + err + ")"; + statusString = "TrackerErr
(" + err + ")"; } } else if (remaining <= 0) { if (isRunning && curPeers > 0 && !showPeers) @@ -553,7 +553,7 @@ public class I2PSnarkServlet extends HttpServlet { out.write("Start "); out.write("Remove
"); + + "\" title=\"Remove the torrent from the active list, deleting the .torrent file\">Remove
"); out.write("Delete "); } @@ -655,13 +655,13 @@ public class I2PSnarkServlet extends HttpServlet { // *not* enctype="multipart/form-data", so that the input type=file sends the filename, not the file out.write("
\n"); out.write("\n"); - out.write("
Add Torrent:
\n"); + out.write("
Add Torrent:
\n"); out.write("From URL : \n"); // not supporting from file at the moment, since the file name passed isn't always absolute (so it may not resolve) - //out.write("From file:
\n"); - out.write("
\n"); - out.write("Alternately, you can copy .torrent files to " + _manager.getDataDir().getAbsolutePath() + "
\n"); - out.write("Removing that .torrent file will cause the torrent to stop.
\n"); + //out.write("From file:
\n"); + out.write("
\n"); + out.write("Alternately, you can copy .torrent files to " + _manager.getDataDir().getAbsolutePath() + "
\n"); + out.write("Removing that .torrent file will cause the torrent to stop.
\n"); out.write("\n
"); } @@ -675,11 +675,11 @@ public class I2PSnarkServlet extends HttpServlet { // *not* enctype="multipart/form-data", so that the input type=file sends the filename, not the file out.write("
\n"); out.write("\n"); - out.write("Create Torrent:
\n"); - //out.write("From file:
\n"); + out.write("Create Torrent:
\n"); + //out.write("From file:
\n"); out.write("Data to seed: " + _manager.getDataDir().getAbsolutePath() + File.separatorChar + "
\n"); + + "\" title=\"File to seed (must be within the specified path)\" />
\n"); out.write("Tracker: \n"); - out.write("Configuration:
\n"); + out.write("Configuration:
\n"); out.write("Data directory: (Edit i2psnark.config and restart to change)
\n"); + out.write("title=\"Directory to store torrents and data\" disabled=\"true\" /> (Edit i2psnark.config and restart to change)
\n"); out.write("Auto start: "); //Auto add: //Auto stop: - //out.write("
\n"); + //out.write("
\n"); /* out.write("Seed percentage:
\n"); + out.write("
\n"); */ out.write("Total uploader limit: peers
\n"); + + _manager.util().getMaxUploaders() + "\" size=\"3\" maxlength=\"3\" /> peers
\n"); out.write("Up bandwidth limit: KBps (Half available bandwidth recommended.)
\n"); + + _manager.util().getMaxUpBW() + "\" size=\"3\" maxlength=\"3\" /> KBps (Half available bandwidth recommended.)
\n"); out.write("Use open trackers also: "); out.write("Announce URLs:
\n"); + + openTrackers + "\" size=\"50\" />
\n"); //out.write("\n"); out.write("EepProxy host: "); out.write("port:
\n"); + + _manager.util().getEepProxyPort() + "\" size=\"5\" maxlength=\"5\" />
\n"); out.write("I2CP host: "); out.write("port:
\n"); + + _manager.util().getI2CPPort() + "\" size=\"5\" maxlength=\"5\" />
\n"); StringBuilder opts = new StringBuilder(64); Map options = new TreeMap(_manager.util().getI2CPOptions()); for (Iterator iter = options.entrySet().iterator(); iter.hasNext(); ) { @@ -763,7 +763,7 @@ public class I2PSnarkServlet extends HttpServlet { opts.append(key).append('=').append(val).append(' '); } out.write("I2CP opts:
\n"); + + opts.toString() + "\" />
\n"); out.write("\n"); out.write("\n"); out.write("
"); diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java index b5ca6c3a1..45d9325cc 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java @@ -464,7 +464,7 @@ public class TunnelController implements Logging { private void getHttpClientSummary(StringBuilder buf) { String description = getDescription(); if ( (description != null) && (description.trim().length() > 0) ) - buf.append("").append(description).append("
\n"); + buf.append("").append(description).append("
\n"); buf.append("HTTP proxy listening on port ").append(getListenPort()); String listenOn = getListenOnInterface(); if ("0.0.0.0".equals(listenOn)) @@ -473,19 +473,19 @@ public class TunnelController implements Logging { buf.append(" (reachable locally only)"); else buf.append(" (reachable at the ").append(listenOn).append(" interface)"); - buf.append("
\n"); + buf.append("
\n"); String proxies = getProxyList(); if ( (proxies == null) || (proxies.trim().length() <= 0) ) - buf.append("Outproxy: default [squid.i2p]
\n"); + buf.append("Outproxy: default [squid.i2p]
\n"); else - buf.append("Outproxy: ").append(proxies).append("
\n"); + buf.append("Outproxy: ").append(proxies).append("
\n"); getOptionSummary(buf); } private void getClientSummary(StringBuilder buf) { String description = getDescription(); if ( (description != null) && (description.trim().length() > 0) ) - buf.append("").append(description).append("
\n"); + buf.append("").append(description).append("
\n"); buf.append("Client tunnel listening on port ").append(getListenPort()); buf.append(" pointing at ").append(getTargetDestination()); String listenOn = getListenOnInterface(); @@ -495,58 +495,58 @@ public class TunnelController implements Logging { buf.append(" (reachable locally only)"); else buf.append(" (reachable at the ").append(listenOn).append(" interface)"); - buf.append("
\n"); + buf.append("
\n"); getOptionSummary(buf); } private void getServerSummary(StringBuilder buf) { String description = getDescription(); if ( (description != null) && (description.trim().length() > 0) ) - buf.append("").append(description).append("
\n"); + buf.append("").append(description).append("
\n"); buf.append("Server tunnel pointing at port ").append(getTargetPort()); buf.append(" on ").append(getTargetHost()); - buf.append("
\n"); - buf.append("Private destination loaded from ").append(getPrivKeyFile()).append("
\n"); + buf.append("
\n"); + buf.append("Private destination loaded from ").append(getPrivKeyFile()).append("
\n"); getOptionSummary(buf); } private void getHttpServerSummary(StringBuilder buf) { String description = getDescription(); if ( (description != null) && (description.trim().length() > 0) ) - buf.append("").append(description).append("
\n"); + buf.append("").append(description).append("
\n"); buf.append("Server tunnel pointing at port ").append(getTargetPort()); buf.append(" on ").append(getTargetHost()); buf.append(" for the site ").append(getSpoofedHost()); - buf.append("
\n"); - buf.append("Private destination loaded from ").append(getPrivKeyFile()).append("
\n"); + buf.append("
\n"); + buf.append("Private destination loaded from ").append(getPrivKeyFile()).append("
\n"); getOptionSummary(buf); } private void getOptionSummary(StringBuilder buf) { String opts = getClientOptions(); if ( (opts != null) && (opts.length() > 0) ) - buf.append("Network options: ").append(opts).append("
\n"); + buf.append("Network options: ").append(opts).append("
\n"); if (_running) { List sessions = _tunnel.getSessions(); for (int i = 0; i < sessions.size(); i++) { I2PSession session = (I2PSession)sessions.get(i); Destination dest = session.getMyDestination(); if (dest != null) { - buf.append("Destination hash: ").append(dest.calculateHash().toBase64()).append("
\n"); + buf.append("Destination hash: ").append(dest.calculateHash().toBase64()).append("
\n"); if ( ("server".equals(getType())) || ("httpserver".equals(getType())) ) { buf.append("Full destination: "); buf.append("\n"); long val = new Random().nextLong(); if (val < 0) val = 0 - val; - buf.append("
You can You can view"); buf.append(" it in a browser (only when you're using the eepProxy)\n"); - buf.append("
If you are going to share this on IRC, you need to split it up:
\n"); + buf.append("
If you are going to share this on IRC, you need to split it up:
\n"); String str = dest.toBase64(); - buf.append(str.substring(0, str.length()/2)).append("
\n"); - buf.append(str.substring(str.length()/2)).append("
\n"); - buf.append("You can also post it to Eepsite announcement forum
"); + buf.append(str.substring(0, str.length()/2)).append("
\n"); + buf.append(str.substring(str.length()/2)).append("
\n"); + buf.append("You can also post it to Eepsite announcement forum
"); } } } diff --git a/apps/i2ptunnel/jsp/editClient.jsp b/apps/i2ptunnel/jsp/editClient.jsp index 26e40afad..ae24c9ab7 100644 --- a/apps/i2ptunnel/jsp/editClient.jsp +++ b/apps/i2ptunnel/jsp/editClient.jsp @@ -50,7 +50,7 @@
-
+
@@ -71,7 +71,7 @@
-
+
@@ -129,7 +129,7 @@
-
+
<% if ("httpclient".equals(tunnelType) || "connectclient".equals(tunnelType)) { @@ -197,7 +197,7 @@
-
+
@@ -265,7 +265,7 @@
-
+
@@ -286,7 +286,7 @@ <% if (!"streamrclient".equals(tunnelType)) { // streamr client sends pings so it will never be idle %>
-
+
@@ -314,7 +314,7 @@
-
+
@@ -349,7 +349,7 @@
-
+
@@ -366,7 +366,7 @@ <% } // !streamrclient %>
-
+
<% if ("client".equals(tunnelType) || "ircclient".equals(tunnelType)) { %> @@ -393,7 +393,7 @@
-
+
<% } %> diff --git a/apps/i2ptunnel/jsp/editServer.jsp b/apps/i2ptunnel/jsp/editServer.jsp index 2acc75183..195fd84cd 100644 --- a/apps/i2ptunnel/jsp/editServer.jsp +++ b/apps/i2ptunnel/jsp/editServer.jsp @@ -50,7 +50,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
@@ -110,7 +110,7 @@
-
+
<% if ("httpserver".equals(tunnelType)) { @@ -164,7 +164,7 @@
-
+
@@ -232,7 +232,7 @@
-
+
@@ -252,7 +252,7 @@
-
+
@@ -281,7 +281,7 @@
-
+
@@ -304,7 +304,7 @@
-
+
@@ -332,7 +332,7 @@
-
+
@@ -382,7 +382,7 @@
-
+
diff --git a/apps/i2ptunnel/jsp/index.jsp b/apps/i2ptunnel/jsp/index.jsp index 4c26bd3da..d0bf6d667 100644 --- a/apps/i2ptunnel/jsp/index.jsp +++ b/apps/i2ptunnel/jsp/index.jsp @@ -27,13 +27,13 @@ p-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
+
-
+
@@ -74,7 +74,7 @@ p-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
+
<% for (int curServer = 0; curServer < indexBean.getTunnelCount(); curServer++) { @@ -141,13 +141,13 @@ p-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
+
<% } %>
-
+
@@ -194,7 +194,7 @@ p-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
+
<% for (int curClient = 0; curClient < indexBean.getTunnelCount(); curClient++) { @@ -262,13 +262,13 @@ p-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
+
<% } %>
-
+
diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkClient.java b/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkClient.java index 2269e585a..fc4df4988 100644 --- a/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkClient.java +++ b/apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkClient.java @@ -117,7 +117,7 @@ public class StreamSinkClient { } /** - * Fire up the client. Usage: StreamSinkClient [i2cpHost i2cpPort] sendSizeKB writeDelayMs serverDestFile [concurrentSends]
+ * Fire up the client. Usage: StreamSinkClient [i2cpHost i2cpPort] sendSizeKB writeDelayMs serverDestFile [concurrentSends]
*