No effective change - Code cleanup, simplified if

This commit is contained in:
Robin Bygrave
2015-07-31 13:23:49 +12:00
parent 88340618af
commit adef15ce2b
14 changed files with 19 additions and 79 deletions
@@ -149,11 +149,8 @@ public class DRawSqlSelectBuilder {
if (placeHolderHaving > -1) {
return true;
}
if (placeHolderAndHaving > -1) {
return true;
}
return false;
}
return placeHolderAndHaving > -1;
}
/**
* Trim off the select keyword (to support row_number() limit function).
@@ -215,11 +215,8 @@ public final class DRawSqlSelectColumnsParser {
if (columnLabel.equalsIgnoreCase(prop.getDbColumn())) {
return true;
}
if (columnLabel.equalsIgnoreCase(prop.getName())) {
return true;
}
return false;
}
return columnLabel.equalsIgnoreCase(prop.getName());
}
private int nextComma() {
boolean inQuote = false;
@@ -167,20 +167,10 @@ public abstract class DeployParser {
} else if (ch == UNDERSCORE) {
return true;
} else if (ch == PERIOD) {
return true;
} else {
return false;
}
} else return ch == PERIOD;
}
private boolean isWordStart(char ch) {
if (Character.isLetter(ch)) {
return true;
} else {
return false;
}
return Character.isLetter(ch);
}
}
@@ -32,10 +32,7 @@ public abstract class AnnotationBase {
* Checks string is null or empty .
*/
protected boolean isEmpty(String s) {
if (s == null || s.trim().length() == 0) {
return true;
}
return false;
return s == null || s.trim().length() == 0;
}