antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

Remove some more unnecessary parentheses

Browse source
This commit is contained in:
hns 2009-09-18 15:01:48 +00:00
parent 7f15b6ab24
commit 82eda00edd
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/helma/objectmodel/db/Relation.java
View file

@ -381,20 +381,20 @@ public final class Relation {
// get group by property // get group by property
groupby = props.getProperty("group"); groupby = props.getProperty("group");
if ((groupby != null) && (groupby.trim().length() == 0)) { if (groupby != null && groupby.trim().length() == 0) {
groupby = null; groupby = null;
} }
if (groupby != null) { if (groupby != null) {
groupbyOrder = props.getProperty("group.order"); groupbyOrder = props.getProperty("group.order");
if ((groupbyOrder != null) && (groupbyOrder.trim().length() == 0)) { if (groupbyOrder != null && groupbyOrder.trim().length() == 0) {
groupbyOrder = null; groupbyOrder = null;
} }
groupbyPrototype = props.getProperty("group.prototype"); groupbyPrototype = props.getProperty("group.prototype");
if ((groupbyPrototype != null) && (groupbyPrototype.trim().length() == 0)) { if (groupbyPrototype != null && groupbyPrototype.trim().length() == 0) {
groupbyPrototype = null; groupbyPrototype = null;
} }
@ -409,17 +409,17 @@ public final class Relation {
String local = props.getProperty("local"); String local = props.getProperty("local");
String foreign = props.getProperty("foreign"); String foreign = props.getProperty("foreign");
if ((local != null) && (foreign != null)) { if (local != null && foreign != null) {
cnst.addElement(new Constraint(local, foreign, false)); cnst.addElement(new Constraint(local, foreign, false));
columnName = local; columnName = local;
} }
// parse additional contstraints from *.1 to *.9 // parse additional contstraints from *.1 to *.9
for (int i=1; i<10; i++) { for (int i = 1; i < 10; i++) {
local = props.getProperty("local."+i); local = props.getProperty("local."+i);
foreign = props.getProperty("foreign."+i); foreign = props.getProperty("foreign."+i);
if ((local != null) && (foreign != null)) { if (local != null && foreign != null) {
cnst.addElement(new Constraint(local, foreign, false)); cnst.addElement(new Constraint(local, foreign, false));
} }
} }