dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14222
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-03-14 11:26:27 +0100
message:
  minor rename
modified:
  dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/DefaultFilterService.java
  dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/DefaultParserService.java
  dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/ParserService.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-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/DefaultFilterService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/DefaultFilterService.java	2014-03-14 10:25:42 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/DefaultFilterService.java	2014-03-14 10:26:27 +0000
@@ -62,7 +62,7 @@
             return Lists.newArrayList();
         }
 
-        Filters parsed = parserService.parserPropertyFilters( filters );
+        Filters parsed = parserService.parsePropertyFilters( filters );
 
         List<T> list = Lists.newArrayList();
 
@@ -102,7 +102,7 @@
         {
             Schema schema = schemaService.getSchema( objects.get( 0 ).getClass() );
 
-            Map<String, Map> excludeMap = parserService.parseFieldExpression( exclude );
+            Map<String, Map> excludeMap = parserService.parseObjectFilter( exclude );
 
             for ( Property property : schema.getProperties() )
             {
@@ -114,7 +114,7 @@
         }
         else
         {
-            fieldMap = parserService.parseFieldExpression( include );
+            fieldMap = parserService.parseObjectFilter( include );
         }
 
         for ( Object object : objects )

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/DefaultParserService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/DefaultParserService.java	2014-03-14 10:25:42 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/DefaultParserService.java	2014-03-14 10:26:27 +0000
@@ -41,7 +41,7 @@
 public class DefaultParserService implements ParserService
 {
     @Override
-    public Filters parserPropertyFilters( List<String> filters )
+    public Filters parsePropertyFilters( List<String> filters )
     {
         Filters parsed = new Filters();
 
@@ -68,7 +68,7 @@
     }
 
     @Override
-    public Map<String, Map> parseFieldExpression( String fields )
+    public Map<String, Map> parseObjectFilter( String fields )
     {
         List<String> prefixList = Lists.newArrayList();
         Map<String, Map> parsed = Maps.newHashMap();

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/ParserService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/ParserService.java	2014-03-14 10:25:42 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/ParserService.java	2014-03-14 10:26:27 +0000
@@ -36,7 +36,7 @@
  */
 public interface ParserService
 {
-    Filters parserPropertyFilters( List<String> filters );
+    Filters parsePropertyFilters( List<String> filters );
 
-    Map<String,Map> parseFieldExpression( String filter );
+    Map<String,Map> parseObjectFilter( String filter );
 }