diff --git a/apps/BOB/src/net/i2p/BOB/BOB.java b/apps/BOB/src/net/i2p/BOB/BOB.java index d179f29cf..b8941629c 100644 --- a/apps/BOB/src/net/i2p/BOB/BOB.java +++ b/apps/BOB/src/net/i2p/BOB/BOB.java @@ -165,7 +165,7 @@ public class BOB implements Runnable, ClientApp { if (classResource != null) { String classPath = classResource.toString(); if (classPath.startsWith("jar")) { - String manifestPath = classPath.substring(0, classPath.lastIndexOf("!") + 1) + + String manifestPath = classPath.substring(0, classPath.lastIndexOf('!') + 1) + "/META-INF/MANIFEST.MF"; try { Manifest manifest = new Manifest(new URL(manifestPath).openStream()); diff --git a/apps/addressbook/java/src/net/i2p/addressbook/HostTxtParser.java b/apps/addressbook/java/src/net/i2p/addressbook/HostTxtParser.java index 37c000ad6..325e38ad9 100644 --- a/apps/addressbook/java/src/net/i2p/addressbook/HostTxtParser.java +++ b/apps/addressbook/java/src/net/i2p/addressbook/HostTxtParser.java @@ -76,7 +76,7 @@ class HostTxtParser { public static HostTxtEntry parse(String inputLine, boolean allowCommandOnly) { if (inputLine.startsWith(";")) return null; - int comment = inputLine.indexOf("#"); + int comment = inputLine.indexOf('#'); String kv; String sprops; if (comment >= 0) { diff --git a/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java b/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java index bf6059d43..435b6a04e 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java +++ b/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java @@ -958,7 +958,7 @@ public class TrackerClient implements Runnable { { announce = a; String s = a.substring(7); - host = s.substring(0, s.indexOf("/")); + host = s.substring(0, s.indexOf('/')); isPrimary = p; interval = INITIAL_SLEEP; } 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 0511d226a..92e572b67 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -1466,7 +1466,7 @@ public class I2PSnarkServlet extends BasicServlet { String fullBasename = basename; if (basename.length() > MAX_DISPLAYED_FILENAME_LENGTH) { String start = basename.substring(0, MAX_DISPLAYED_FILENAME_LENGTH); - if (start.indexOf(" ") < 0 && start.indexOf("-") < 0) { + if (start.indexOf(' ') < 0 && start.indexOf('-') < 0) { // browser has nowhere to break it basename = start + HELLIP; } @@ -3086,7 +3086,7 @@ public class I2PSnarkServlet extends BasicServlet { : tx + ": " + directory); if (showSort) buf.append(""); - int dirSlash = directory.indexOf("/"); + int dirSlash = directory.indexOf('/'); if (dirSlash > 0) { buf.append(" "); buf.append(DataHelper.escapeHTML(directory.substring(dirSlash + 1))); diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/InclusiveByteRange.java b/apps/i2psnark/java/src/org/klomp/snark/web/InclusiveByteRange.java index e71e5e3bc..e6445b1ab 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/InclusiveByteRange.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/InclusiveByteRange.java @@ -96,7 +96,7 @@ public class InclusiveByteRange long first = -1; long last = -1; int d = t.indexOf('-'); - if (d < 0 || t.indexOf("-",d + 1) >= 0) + if (d < 0 || t.indexOf('-',d + 1) >= 0) { if ("bytes".equals(t)) continue; diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/MimeTypes.java b/apps/i2psnark/java/src/org/klomp/snark/web/MimeTypes.java index f0b9af7df..a5a973657 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/MimeTypes.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/MimeTypes.java @@ -105,7 +105,7 @@ class MimeTypes int i=-1; while(type==null) { - i=filename.indexOf(".",i+1); + i=filename.indexOf('.',i+1); if (i<0 || i>=filename.length()) break; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java index fc9ecebfd..4b61312bb 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java @@ -380,8 +380,8 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging { } public void runCommand(String cmd, Logging l) { - if (cmd.indexOf(" ") == -1) cmd += " "; - int iii = cmd.indexOf(" "); + if (cmd.indexOf(' ') == -1) cmd += ' '; + int iii = cmd.indexOf(' '); String cmdname = cmd.substring(0, iii).toLowerCase(Locale.US); String allargs = cmd.substring(iii + 1); String[] args = split(allargs, " "); // .split(" "); // java 1.4 diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java index fe9e92e94..619e5d44a 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java @@ -166,14 +166,14 @@ public class I2PTunnelConnectClient extends I2PTunnelHTTPClientBase implements R _log.debug(getPrefix(requestId) + "Line=[" + line + "]"); if (method == null) { // first line CONNECT blah.i2p:80 HTTP/1.1 - int pos = line.indexOf(" "); + int pos = line.indexOf(' '); if (pos == -1) break; // empty first line method = line.substring(0, pos); String request = line.substring(pos + 1); - pos = request.indexOf(":"); + pos = request.indexOf(':'); if (pos == -1) - pos = request.indexOf(" "); + pos = request.indexOf(' '); if (pos == -1) { host = request; restofline = ""; @@ -185,7 +185,7 @@ public class I2PTunnelConnectClient extends I2PTunnelHTTPClientBase implements R if (host.toLowerCase(Locale.US).endsWith(".i2p")) { // Destination gets the host name destination = host; - } else if (host.indexOf(".") != -1) { + } else if (host.indexOf('.') != -1) { // The request must be forwarded to a outproxy currentProxy = selectProxy(); if (currentProxy == null) { diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java index c6c8af173..46a030dd4 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java @@ -430,7 +430,7 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable { try { int myPort = Integer.parseInt(key); String host = (String) e.getValue(); - int colon = host.indexOf(":"); + int colon = host.indexOf(':'); int port = Integer.parseInt(host.substring(colon + 1)); host = host.substring(0, colon); InetSocketAddress isa = new InetSocketAddress(host, port); diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java index da615301e..ff7698fe8 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java @@ -167,8 +167,8 @@ public class I2Ping extends I2PTunnelClientBase { if (line.startsWith("#")) continue; // comments if (line.startsWith(";")) continue; if (line.startsWith("!")) continue; - if (line.indexOf("=") != -1) { // maybe file is hosts.txt? - line = line.substring(0, line.indexOf("=")); + if (line.indexOf('=') != -1) { // maybe file is hosts.txt? + line = line.substring(0, line.indexOf('=')); } PingHandler ph = new PingHandler(line, count, localPort, remotePort, timeout, countPing, reportTimes); diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IRCFilter.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IRCFilter.java index 4c60d2600..4089c74fd 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IRCFilter.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IRCFilter.java @@ -380,7 +380,7 @@ abstract class IRCFilter { if("USER".equals(command)) { if (field.length < 3) return s; // invalid, allow server response - int idx = field[2].lastIndexOf(":"); + int idx = field[2].lastIndexOf(':'); if(idx<0) return "USER user hostname localhost :realname"; String realname = field[2].substring(idx+1); diff --git a/apps/jetty/java/src/net/i2p/servlet/RequestWrapper.java b/apps/jetty/java/src/net/i2p/servlet/RequestWrapper.java index 4ec622f20..5ba917d4b 100644 --- a/apps/jetty/java/src/net/i2p/servlet/RequestWrapper.java +++ b/apps/jetty/java/src/net/i2p/servlet/RequestWrapper.java @@ -139,7 +139,7 @@ public class RequestWrapper { String key = e.getKey(); if( key.toLowerCase(Locale.US).compareToIgnoreCase( "content-type") == 0 ) { String value = e.getValue(); - int i = value.indexOf( ";" ); + int i = value.indexOf( ';' ); if( i != -1 ) result = value.substring( 0, i ); else diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketAddress.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketAddress.java index 6afe5ad21..7b35e7a6c 100644 --- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketAddress.java +++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketAddress.java @@ -31,7 +31,7 @@ public class I2PSocketAddress extends SocketAddress { */ public I2PSocketAddress(String host) { int port = 0; - int colon = host.indexOf(":"); + int colon = host.indexOf(':'); if (colon > 0) { try { port = Integer.parseInt(host.substring(colon + 1)); diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketEepGet.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketEepGet.java index bd82c12f3..c93c37a26 100644 --- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketEepGet.java +++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketEepGet.java @@ -128,7 +128,7 @@ public class I2PSocketEepGet extends EepGet { if ("i2p".equals(host)) { String file = url.getRawPath(); try { - int slash = 1 + file.substring(1).indexOf("/"); + int slash = 1 + file.substring(1).indexOf('/'); host = file.substring(1, slash); _actualURL = "http://" + host + file.substring(slash); String query = url.getRawQuery(); diff --git a/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java b/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java index f27215f2c..44847b1b9 100644 --- a/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java +++ b/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java @@ -370,9 +370,9 @@ class PluginUpdateRunner extends UpdateRunner { String appName = props.getProperty("name"); String version = props.getProperty("version"); if (appName == null || version == null || appName.length() <= 0 || version.length() <= 0 || - appName.indexOf("<") >= 0 || appName.indexOf(">") >= 0 || - version.indexOf("<") >= 0 || version.indexOf(">") >= 0 || - appName.startsWith(".") || appName.indexOf("/") >= 0 || appName.indexOf("\\") >= 0) { + appName.indexOf('<') >= 0 || appName.indexOf('>') >= 0 || + version.indexOf('<') >= 0 || version.indexOf('>') >= 0 || + appName.startsWith(".") || appName.indexOf('/') >= 0 || appName.indexOf('\\') >= 0) { to.delete(); statusDone("" + _t("Plugin from {0} has invalid name or version", url) + ""); return; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java index 7928ca791..844dd3d5d 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java @@ -246,7 +246,7 @@ public class ConfigClientsHandler extends FormHandler { isAdvanced()) { String desc = getJettyString("nofilter_desc" + cur); if (desc != null) { - int spc = desc.indexOf(" "); + int spc = desc.indexOf(' '); String clss = desc; String args = null; if (spc >= 0) { @@ -267,7 +267,7 @@ public class ConfigClientsHandler extends FormHandler { String newDesc = getJettyString("nofilter_desc" + newClient); if (newDesc != null && newDesc.trim().length() > 0) { // new entry - int spc = newDesc.indexOf(" "); + int spc = newDesc.indexOf(' '); String clss = newDesc; String args = null; if (spc >= 0) { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java index 69c4dca69..42a3f0eca 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java @@ -250,7 +250,7 @@ public class ConfigClientsHelper extends HelperBase { .append(_t("Signed by")).append("