r9925 - helma/helma/trunk/src/helma/objectmodel/db

Author: hannes
Date: 2009-09-18 17:01:48 +0200 (Fri, 18 Sep 2009)
New Revision: 9925

Modified:
   helma/helma/trunk/src/helma/objectmodel/db/Relation.java
Log:
Remove some more unnecessary parentheses

Details at http://dev.helma.org/trac/helma/changeset/9925

Modified: helma/helma/trunk/src/helma/objectmodel/db/Relation.java
===================================================================
--- helma/helma/trunk/src/helma/objectmodel/db/Relation.java	2009-09-18 13:03:53 UTC (rev 9924)
+++ helma/helma/trunk/src/helma/objectmodel/db/Relation.java	2009-09-18 15:01:48 UTC (rev 9925)
@@ -381,20 +381,20 @@
         // get group by property
         groupby = props.getProperty("group");
 
-        if ((groupby != null) && (groupby.trim().length() == 0)) {
+        if (groupby != null && groupby.trim().length() == 0) {
             groupby = null;
         }
 
         if (groupby != null) {
             groupbyOrder = props.getProperty("group.order");
 
-            if ((groupbyOrder != null) && (groupbyOrder.trim().length() == 0)) {
+            if (groupbyOrder != null && groupbyOrder.trim().length() == 0) {
                 groupbyOrder = null;
             }
 
             groupbyPrototype = props.getProperty("group.prototype");
 
-            if ((groupbyPrototype != null) && (groupbyPrototype.trim().length() == 0)) {
+            if (groupbyPrototype != null && groupbyPrototype.trim().length() == 0) {
                 groupbyPrototype = null;
             }
 
@@ -409,17 +409,17 @@
         String local = props.getProperty("local");
         String foreign = props.getProperty("foreign");
 
-        if ((local != null) && (foreign != null)) {
+        if (local != null && foreign != null) {
             cnst.addElement(new Constraint(local, foreign, false));
             columnName = local;
         }
 
         // 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);
             foreign = props.getProperty("foreign."+i);
 
-            if ((local != null) && (foreign != null)) {
+            if (local != null && foreign != null) {
                 cnst.addElement(new Constraint(local, foreign, false));
             }
         }