dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #33138
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16883: IDE warning fixes
------------------------------------------------------------
revno: 16883
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-09-30 18:51:51 +0200
message:
IDE warning fixes
modified:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/DefaultObjectFilterService.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/metadata/DefaultImportService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.java 2014-05-31 12:59:54 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.java 2014-09-30 16:51:51 +0000
@@ -144,7 +144,7 @@
log.info( "User '" + username + "' started import at " + new Date() );
notifier.clear( taskId ).notify( taskId, "Importing meta-data" );
- Timer timer = new SystemNanoTimer().start();
+ Timer<Long> timer = new SystemNanoTimer().start();
ImportSummary importSummary = new ImportSummary();
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/DefaultObjectFilterService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/DefaultObjectFilterService.java 2014-09-24 14:26:12 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/DefaultObjectFilterService.java 2014-09-30 16:51:51 +0000
@@ -29,8 +29,10 @@
*/
import com.google.common.collect.Lists;
+
import org.hisp.dhis.common.IdentifiableObject;
import org.hisp.dhis.dxf2.objectfilter.ops.Op;
+import org.hisp.dhis.dxf2.objectfilter.ops.OpStatus;
import org.hisp.dhis.dxf2.parser.ParserService;
import org.hisp.dhis.schema.Property;
import org.hisp.dhis.schema.Schema;
@@ -177,12 +179,11 @@
for ( Op op : ops )
{
- switch ( op.evaluate( value ) )
+ OpStatus status = op.evaluate( value );
+
+ if ( OpStatus.INCLUDE.equals( status ) )
{
- case INCLUDE:
- {
- include = true;
- }
+ include = true;
}
}