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(""); String s = stripHTML(appProps, "signer"); if (s != null) { - if (s.indexOf("@") > 0) + if (s.indexOf('@') > 0) desc.append("").append(s).append(""); else desc.append(s); @@ -271,7 +271,7 @@ public class ConfigClientsHelper extends HelperBase { if (s != null) { desc.append("") .append(_t("Author")).append(""); - if (s.indexOf("@") > 0) + if (s.indexOf('@') > 0) desc.append("").append(s).append(""); else desc.append(s); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/LocaleWebAppHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/LocaleWebAppHandler.java index 00aa01f24..89cb77a3b 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/LocaleWebAppHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/LocaleWebAppHandler.java @@ -61,7 +61,7 @@ public class LocaleWebAppHandler extends HandlerWrapper if (pathInContext.equals("/") || pathInContext.equals("/index.html")) { // home page pathInContext = "/index.jsp"; - } else if (pathInContext.indexOf("/", 1) < 0 && + } else if (pathInContext.indexOf('/', 1) < 0 && (!pathInContext.endsWith(".jsp")) && (!pathInContext.endsWith(".log")) && (!pathInContext.endsWith(".txt"))) { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java b/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java index 3420d6075..cc749e0d7 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java @@ -725,7 +725,7 @@ public class PluginStarter implements Runnable { // argument array comparison in getClientApp() works. // Do this after parsing so we don't need to worry about quoting for (int i = 0; i < argVal.length; i++) { - if (argVal[i].indexOf("$") >= 0) { + if (argVal[i].indexOf('$') >= 0) { argVal[i] = argVal[i].replace("$I2P", ctx.getBaseDir().getAbsolutePath()); argVal[i] = argVal[i].replace("$CONFIG", ctx.getConfigDir().getAbsolutePath()); argVal[i] = argVal[i].replace("$PLUGIN", pluginDir.getAbsolutePath()); @@ -764,7 +764,7 @@ public class PluginStarter implements Runnable { } // do this after parsing so we don't need to worry about quoting for (int i = 0; i < argVal.length; i++) { - if (argVal[i].indexOf("$") >= 0) { + if (argVal[i].indexOf('$') >= 0) { argVal[i] = argVal[i].replace("$I2P", ctx.getBaseDir().getAbsolutePath()); argVal[i] = argVal[i].replace("$CONFIG", ctx.getConfigDir().getAbsolutePath()); argVal[i] = argVal[i].replace("$PLUGIN", pluginDir.getAbsolutePath()); @@ -774,7 +774,7 @@ public class PluginStarter implements Runnable { ClassLoader cl = null; if (app.classpath != null) { String cp = app.classpath; - if (cp.indexOf("$") >= 0) { + if (cp.indexOf('$') >= 0) { cp = cp.replace("$I2P", ctx.getBaseDir().getAbsolutePath()); cp = cp.replace("$CONFIG", ctx.getConfigDir().getAbsolutePath()); cp = cp.replace("$PLUGIN", pluginDir.getAbsolutePath()); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java index b43fd2518..99f0c31ff 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java @@ -52,7 +52,7 @@ class ProfileOrganizerRenderer { continue; if (mode == 2) { RouterInfo info = _context.netDb().lookupRouterInfoLocally(peer); - if (info != null && info.getCapabilities().indexOf("f") >= 0) + if (info != null && info.getCapabilities().indexOf('f') >= 0) order.add(prof); continue; } diff --git a/apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java b/apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java index c6ed6243b..8a0d0bd10 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java +++ b/apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java @@ -172,7 +172,7 @@ class SAMHandlerFactory { private static int getMajor(String ver) { if (ver == null) return -1; - int dot = ver.indexOf("."); + int dot = ver.indexOf('.'); if (dot == 0) return -1; if (dot > 0) @@ -189,7 +189,7 @@ class SAMHandlerFactory { if ( (ver == null) || (ver.indexOf('.') < 0) ) return -1; try { - String major = ver.substring(ver.indexOf(".") + 1); + String major = ver.substring(ver.indexOf('.') + 1); return Integer.parseInt(major); } catch (NumberFormatException e) { return -1; diff --git a/apps/susimail/src/src/i2p/susi/webmail/Mail.java b/apps/susimail/src/src/i2p/susi/webmail/Mail.java index ed5c3aa14..e43fe3b8a 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/Mail.java +++ b/apps/susimail/src/src/i2p/susi/webmail/Mail.java @@ -187,8 +187,8 @@ class Mail { address = address.trim(); - if( address.indexOf( "\n" ) != -1 || - address.indexOf( "\r" ) != -1 ) + if( address.indexOf('\n') != -1 || + address.indexOf('\r') != -1 ) return false; String[] tokens = DataHelper.split(address, "[ \t]+"); diff --git a/apps/susimail/src/src/i2p/susi/webmail/MailPart.java b/apps/susimail/src/src/i2p/susi/webmail/MailPart.java index ff348a502..14d4075ac 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/MailPart.java +++ b/apps/susimail/src/src/i2p/susi/webmail/MailPart.java @@ -213,7 +213,7 @@ class MailPart { String result = null; int i = line.indexOf( ": " ); if( i != - 1 ) { - int j = line.indexOf( ";", i + 2 ); + int j = line.indexOf(';', i + 2 ); if( j == -1 ) result = line.substring( i + 2 ); else @@ -234,11 +234,11 @@ class MailPart { if( i == -1 ) break; h = i + l; - int j = line.indexOf( "=", i + l ); + int j = line.indexOf('=', i + l ); // System.err.println( "j=" + j ); if( j != -1 ) { - int k = line.indexOf( "\"", j + 1 ); - int m = line.indexOf( ";", j + 1 ); + int k = line.indexOf('"', j + 1 ); + int m = line.indexOf(';', j + 1 ); // System.err.println( "k=" + k ); if( k != -1 && ( m == -1 || k < m ) ) { /* @@ -249,7 +249,7 @@ class MailPart { m = -1; int k2 = k + 1; while( true ) { - m = line.indexOf( "\"", k2 ); + m = line.indexOf('"', k2 ); // System.err.println( "m=" + m + " '" + line.substring( m ) + "'" ); if( m == -1 ) { break; diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java index 0262f0d74..c9e5198d9 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java +++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java @@ -1197,10 +1197,10 @@ public class WebMail extends HttpServlet if (filename != null && (buttonPressed(request, NEW_UPLOAD) || buttonPressed(request, SEND))) { Debug.debug(Debug.DEBUG, "Got filename in compose form: " + filename); - int i = filename.lastIndexOf( "/" ); + int i = filename.lastIndexOf('/'); if( i != - 1 ) filename = filename.substring( i + 1 ); - i = filename.lastIndexOf( "\\" ); + i = filename.lastIndexOf('\\'); if( i != -1 ) filename = filename.substring( i + 1 ); if( filename != null && filename.length() > 0 ) { diff --git a/apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java b/apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java index 5ed201827..6dfdfef21 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java +++ b/apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java @@ -490,7 +490,7 @@ public class POP3MailBox implements NewMailListener { } response = response.trim(); try { - int i = response.indexOf(" ", 5); + int i = response.indexOf(' ', 5); mails = Integer.parseInt( i != -1 @@ -510,7 +510,7 @@ public class POP3MailBox implements NewMailListener { uidlToID.clear(); if (lines != null) { for (String line : lines) { - int j = line.indexOf( " " ); + int j = line.indexOf(' '); if( j != -1 ) { try { int n = Integer.parseInt( line.substring( 0, j ) ); @@ -541,7 +541,7 @@ public class POP3MailBox implements NewMailListener { sizes.clear(); if (lines != null) { for (String line : lines) { - int j = line.indexOf(" "); + int j = line.indexOf(' '); if (j != -1) { try { int key = Integer.parseInt(line.substring(0, j)); diff --git a/core/java/src/net/i2p/client/naming/HostTxtEntry.java b/core/java/src/net/i2p/client/naming/HostTxtEntry.java index 543365949..3023649d4 100644 --- a/core/java/src/net/i2p/client/naming/HostTxtEntry.java +++ b/core/java/src/net/i2p/client/naming/HostTxtEntry.java @@ -117,7 +117,7 @@ public class HostTxtEntry { String[] entries = DataHelper.split(line, "#"); for (int i = 0; i < entries.length; i++) { String kv = entries[i]; - int eq = kv.indexOf("="); + int eq = kv.indexOf('='); if (eq <= 0 || eq == kv.length() - 1) throw new IllegalArgumentException("No value: \"" + kv + '"'); String k = kv.substring(0, eq); diff --git a/core/java/src/net/i2p/util/Addresses.java b/core/java/src/net/i2p/util/Addresses.java index db28be6ba..8cadf24f3 100644 --- a/core/java/src/net/i2p/util/Addresses.java +++ b/core/java/src/net/i2p/util/Addresses.java @@ -190,7 +190,7 @@ public abstract class Addresses { * @since IPv6 */ private static String stripScope(String ip) { - int pct = ip.indexOf("%"); + int pct = ip.indexOf('%'); if (pct > 0) ip = ip.substring(0, pct); return ip; diff --git a/core/java/src/net/i2p/util/CommandLine.java b/core/java/src/net/i2p/util/CommandLine.java index 176cc802c..974c8532e 100644 --- a/core/java/src/net/i2p/util/CommandLine.java +++ b/core/java/src/net/i2p/util/CommandLine.java @@ -58,7 +58,7 @@ public class CommandLine { protected static void exec(String args[], List classes) { String cmd = args[0].toLowerCase(Locale.US); for (String cls : classes) { - String ccmd = cls.substring(cls.lastIndexOf(".") + 1).toLowerCase(Locale.US); + String ccmd = cls.substring(cls.lastIndexOf('.') + 1).toLowerCase(Locale.US); if (cmd.equals(ccmd)) { try { String[] cargs = new String[args.length - 1]; @@ -85,7 +85,7 @@ public class CommandLine { System.err.println("Available commands:"); List cmds = new ArrayList(classes.size()); for (String cls : classes) { - String ccmd = cls.substring(cls.lastIndexOf(".") + 1).toLowerCase(Locale.US); + String ccmd = cls.substring(cls.lastIndexOf('.') + 1).toLowerCase(Locale.US); cmds.add(ccmd); } Collections.sort(cmds); diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java index 2c1a929d9..a0d7f3a65 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java @@ -170,7 +170,7 @@ class FloodfillMonitorJob extends JobImpl { if (wasFF) ffcount++; int good = ffcount - failcount; - boolean happy = getContext().router().getRouterInfo().getCapabilities().indexOf("R") >= 0; + boolean happy = getContext().router().getRouterInfo().getCapabilities().indexOf('R') >= 0; // TODO - limit may still be too high // For reference, the avg lifetime job lag on my Pi is 6. // Should we consider avg. dropped ff jobs?