No effective change - Code cleanup, remove unnecessary return

This commit is contained in:
Robin Bygrave
2015-07-31 13:25:54 +12:00
parent adef15ce2b
commit 4a13fc307b
3 changed files with 11 additions and 18 deletions
@@ -259,7 +259,7 @@ public class StringHelper {
}
}
// we have finished parsing the string...
return;
} else {
// get the delimited value... add it..
String value = str.substring(startPos, endPos);
@@ -252,24 +252,20 @@ public class StringHelper {
if (startPos <= str.length()) {
String lastValue = str.substring(startPos, str.length());
// dp("lastValue="+lastValue);
if (!keepEmpties && lastValue.length() == 0) {
// dp("not keeping...");
} else {
list.add(lastValue);
}
}
if (keepEmpties || lastValue.length() != 0) {
list.add(lastValue);
}
}
// we have finished parsing the string...
return;
} else {
// get the delimited value... add it..
String value = str.substring(startPos, endPos);
// dp(startPos+","+endPos+" value="+value);
if (!keepEmpties && value.length() == 0) {
// dp("not keeping...");
} else {
list.add(value);
}
// recursively search as we are not at the end yet...
if (keepEmpties || value.length() != 0) {
list.add(value);
}
// recursively search as we are not at the end yet...
delimiter(str, delimiter, keepEmpties, endPos + 1, list);
}
}
@@ -308,10 +308,7 @@ public class SqlTreeBuilder {
IncludesDistiller extraJoinDistill = new IncludesDistiller(desc, selectIncludes, predicateIncludes);
Collection<SqlTreeNodeExtraJoin> extraJoins = extraJoinDistill.getExtraJoinRootNodes();
if (extraJoins.isEmpty()) {
return;
} else {
if (!extraJoins.isEmpty()) {
// add extra joins required to support predicates
// and/or order by clause
for (SqlTreeNodeExtraJoin extraJoin: extraJoins) {