Changeset: 6beecac8aa1b for monetdb-java URL: https://dev.monetdb.org/hg/monetdb-java/rev/6beecac8aa1b Modified Files: src/main/java/org/monetdb/client/JMonetDB.java src/main/java/org/monetdb/client/JdbcClient.java src/main/java/org/monetdb/jdbc/MonetCallableStatement.java src/main/java/org/monetdb/mcl/net/MapiSocket.java Branch: default Log Message:
Use indexOf(char) instead of indexOf(String) where possible. diffs (59 lines): diff --git a/src/main/java/org/monetdb/client/JMonetDB.java b/src/main/java/org/monetdb/client/JMonetDB.java --- a/src/main/java/org/monetdb/client/JMonetDB.java +++ b/src/main/java/org/monetdb/client/JMonetDB.java @@ -96,8 +96,8 @@ public final class JMonetDB { // build the hostname String host = copts.getOption("host").getArgument(); String sport = copts.getOption("port").getArgument(); - int pos; - if ((pos = host.indexOf(":")) != -1) { + int pos = host.indexOf(':'); + if (pos != -1) { sport = host.substring(pos + 1); host = host.substring(0, pos); } diff --git a/src/main/java/org/monetdb/client/JdbcClient.java b/src/main/java/org/monetdb/client/JdbcClient.java --- a/src/main/java/org/monetdb/client/JdbcClient.java +++ b/src/main/java/org/monetdb/client/JdbcClient.java @@ -284,7 +284,7 @@ public class JdbcClient { /* cannot (yet // build the hostname String host = copts.getOption("host").getArgument(); - if (host.indexOf(":") == -1) { + if (host.indexOf(':') == -1) { host = host + ":" + copts.getOption("port").getArgument(); } @@ -963,7 +963,7 @@ public class JdbcClient { /* cannot (yet String obj_nm = object; int len; boolean found = false; - final int dot = object.indexOf("."); + final int dot = object.indexOf('.'); if (dot > 0) { // use specified schema schema = object.substring(0, dot); diff --git a/src/main/java/org/monetdb/jdbc/MonetCallableStatement.java b/src/main/java/org/monetdb/jdbc/MonetCallableStatement.java --- a/src/main/java/org/monetdb/jdbc/MonetCallableStatement.java +++ b/src/main/java/org/monetdb/jdbc/MonetCallableStatement.java @@ -112,7 +112,7 @@ public final class MonetCallableStatemen if (query == null) return null; - final int firstAccOpen = query.indexOf("{"); + final int firstAccOpen = query.indexOf('{'); if (firstAccOpen == -1) // nothing to remove return query; diff --git a/src/main/java/org/monetdb/mcl/net/MapiSocket.java b/src/main/java/org/monetdb/mcl/net/MapiSocket.java --- a/src/main/java/org/monetdb/mcl/net/MapiSocket.java +++ b/src/main/java/org/monetdb/mcl/net/MapiSocket.java @@ -343,7 +343,7 @@ public class MapiSocket { /* cannot (yet if (tmp != null) { final String args[] = tmp.split("&"); for (int i = 0; i < args.length; i++) { - int pos = args[i].indexOf("="); + int pos = args[i].indexOf('='); if (pos > 0) { tmp = args[i].substring(0, pos); switch (tmp) { _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org