dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 19268
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-06-03 10:42:15 +0700
message:
  minor fixes to Query
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Conjunction.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Criteria.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Disjunction.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Query.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Conjunction.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Conjunction.java	2015-06-02 07:39:57 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Conjunction.java	2015-06-03 03:42:15 +0000
@@ -35,7 +35,7 @@
  */
 public class Conjunction extends Junction
 {
-    public Conjunction( Schema schema, Type type )
+    public Conjunction( Schema schema )
     {
         super( schema, Type.AND );
     }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Criteria.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Criteria.java	2015-06-02 07:39:57 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Criteria.java	2015-06-03 03:42:15 +0000
@@ -59,6 +59,7 @@
         {
             if ( !Restriction.class.isInstance( criterion ) )
             {
+                this.criterions.add( criterion ); // if conjunction/disjunction just add it and move forward
                 continue;
             }
 

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Disjunction.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Disjunction.java	2015-06-02 07:39:57 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Disjunction.java	2015-06-03 03:42:15 +0000
@@ -35,7 +35,7 @@
  */
 public class Disjunction extends Junction
 {
-    public Disjunction( Schema schema, Type type )
+    public Disjunction( Schema schema )
     {
         super( schema, Type.OR );
     }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Query.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Query.java	2015-06-02 07:39:57 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Query.java	2015-06-03 03:42:15 +0000
@@ -109,6 +109,16 @@
         return this;
     }
 
+    public Disjunction addDisjunction()
+    {
+        return new Disjunction( schema );
+    }
+
+    public Conjunction addConjunction()
+    {
+        return new Conjunction( schema );
+    }
+
     public Query forceDefaultOrder()
     {
         orders.clear();