=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java 2013-12-28 15:15:11 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java 2013-12-30 12:23:52 +0000 @@ -206,7 +206,7 @@ for ( PatientAttributeValue attributeValue : patient.getAttributeValues() ) { if ( attributeValue.getPatientAttribute().getUid().equals( criteria.getProperty() ) ) - {System.out.println("\n\n ===== \n attribute : " + attributeValue.getPatientAttribute().getDisplayName()); + { value = attributeValue.getValue(); break; } === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/UserSettingDeletionHandler.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/UserSettingDeletionHandler.java 2013-09-16 17:07:25 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/UserSettingDeletionHandler.java 2013-12-30 12:23:52 +0000 @@ -73,7 +73,6 @@ @Override public void deleteUser( User user ) { - System.out.println("yes"); for ( UserSetting setting : userService.getAllUserSettings( user ) ) { userService.deleteUserSetting( setting ); === modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/appmanager/DefaultAppManagerServiceTest.java' --- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/appmanager/DefaultAppManagerServiceTest.java 2013-10-22 15:02:04 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/appmanager/DefaultAppManagerServiceTest.java 2013-12-30 12:23:52 +0000 @@ -32,10 +32,6 @@ import java.util.List; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; @@ -45,31 +41,6 @@ */ public class DefaultAppManagerServiceTest { - - public DefaultAppManagerServiceTest() - { - } - - @BeforeClass - public static void setUpClass() - { - } - - @AfterClass - public static void tearDownClass() - { - } - - @Before - public void setUp() - { - } - - @After - public void tearDown() - { - } - /** * Test of getAppFolderPath method, of class DefaultAppManagerService. */ @@ -77,7 +48,6 @@ @Ignore public void testGetAppFolderPath() { - System.out.println( "getAppFolderPath" ); DefaultAppManager instance = new DefaultAppManager(); String expResult = ""; String result = instance.getAppFolderPath(); @@ -93,7 +63,6 @@ @Ignore public void testGetAppStoreUrl() { - System.out.println( "getAppStoreUrl" ); DefaultAppManager instance = new DefaultAppManager(); String expResult = ""; String result = instance.getAppStoreUrl(); @@ -109,7 +78,6 @@ @Ignore public void testGetInstalledApps() { - System.out.println( "getInstalledApps" ); DefaultAppManager instance = new DefaultAppManager(); List expResult = null; List result = instance.getApps(); @@ -125,7 +93,6 @@ @Ignore public void testSetAppFolderPath() { - System.out.println( "setAppFolderPath" ); String appFolderPath = ""; DefaultAppManager instance = new DefaultAppManager(); instance.setAppFolderPath( appFolderPath ); @@ -140,7 +107,6 @@ @Ignore public void testSetAppStoreUrl() { - System.out.println( "setAppStoreUrl" ); String appStoreUrl = ""; DefaultAppManager instance = new DefaultAppManager(); instance.setAppStoreUrl( appStoreUrl ); === modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/validation/ValidationRuleServiceTest.java' --- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/validation/ValidationRuleServiceTest.java 2013-12-19 18:12:57 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/validation/ValidationRuleServiceTest.java 2013-12-30 12:23:52 +0000 @@ -628,7 +628,6 @@ @Test public void testValidateMonitoringSequential() { - // System.out.println("\ntestValidateMonitoring1Sequential"); // Note: for some monitoring tests, we enter more data than needed, to be sure the extra data *isn't* used. dataValueService.addDataValue( createDataValue( dataElementB, periodA, sourceA, "11", optionCombo, optionCombo ) ); // Mar 2000 @@ -673,8 +672,6 @@ @Test public void testValidateMonitoringAnnual() { - // System.out.println("\ntestValidateMonitoring1Annual"); - dataValueService.addDataValue( createDataValue( dataElementB, periodA, sourceA, "11", optionCombo, optionCombo ) ); // Mar 2000 dataValueService.addDataValue( createDataValue( dataElementB, periodB, sourceA, "12", optionCombo, optionCombo ) ); // Apr 2000 dataValueService.addDataValue( createDataValue( dataElementB, periodC, sourceA, "13", optionCombo, optionCombo ) ); // May 2000 @@ -717,8 +714,6 @@ @Test public void testValidateMonitoring1Sequential2Annual() { - // System.out.println("\ntestValidateMonitoring1Sequential2Annual"); - dataValueService.addDataValue( createDataValue( dataElementB, periodA, sourceA, "11", optionCombo, optionCombo ) ); // Mar 2000 dataValueService.addDataValue( createDataValue( dataElementB, periodB, sourceA, "12", optionCombo, optionCombo ) ); // Apr 2000 dataValueService.addDataValue( createDataValue( dataElementB, periodC, sourceA, "13", optionCombo, optionCombo ) ); // May 2000 @@ -763,8 +758,6 @@ @Test public void testValidateMonitoring2Sequential2Annual() { - // System.out.println("\ntestValidateMonitoring2Sequential2Annual"); - dataValueService.addDataValue( createDataValue( dataElementB, periodA, sourceA, "11", optionCombo, optionCombo ) ); // Mar 2000 dataValueService.addDataValue( createDataValue( dataElementB, periodB, sourceA, "12", optionCombo, optionCombo ) ); // Apr 2000 dataValueService.addDataValue( createDataValue( dataElementB, periodC, sourceA, "13", optionCombo, optionCombo ) ); // May 2000 @@ -809,8 +802,6 @@ @Test public void testValidateMonitoring2HighOutliers() { - // System.out.println("\ntestValidateMonitoring2HighOutliers"); - dataValueService.addDataValue( createDataValue( dataElementB, periodA, sourceA, "11", optionCombo, optionCombo ) ); // Mar 2000 dataValueService.addDataValue( createDataValue( dataElementB, periodB, sourceA, "12", optionCombo, optionCombo ) ); // Apr 2000 dataValueService.addDataValue( createDataValue( dataElementB, periodC, sourceA, "13", optionCombo, optionCombo ) ); // May 2000 @@ -855,8 +846,6 @@ @Test public void testValidateMonitoring2LowOutliers() { - // System.out.println("\ntestValidateMonitoring2LowOutliers"); - dataValueService.addDataValue( createDataValue( dataElementB, periodA, sourceA, "11", optionCombo, optionCombo ) ); // Mar 2000 dataValueService.addDataValue( createDataValue( dataElementB, periodB, sourceA, "12", optionCombo, optionCombo ) ); // Apr 2000 dataValueService.addDataValue( createDataValue( dataElementB, periodC, sourceA, "13", optionCombo, optionCombo ) ); // May 2000 @@ -901,8 +890,6 @@ @Test public void testValidateMonitoring2High2LowOutliers() { - // System.out.println("\ntestValidateMonitoring2High2LowOutliers"); - dataValueService.addDataValue( createDataValue( dataElementB, periodA, sourceA, "11", optionCombo, optionCombo ) ); // Mar 2000 dataValueService.addDataValue( createDataValue( dataElementB, periodB, sourceA, "12", optionCombo, optionCombo ) ); // Apr 2000 dataValueService.addDataValue( createDataValue( dataElementB, periodC, sourceA, "13", optionCombo, optionCombo ) ); // May 2000 @@ -947,8 +934,6 @@ @Test public void testValidateMonitoringWithBaseline() { - // System.out.println("\ntestValidateMonitoringWithBaseline"); - dataValueService.addDataValue( createDataValue( dataElementB, periodA, sourceB, "11", optionCombo, optionCombo ) ); // Mar 2000 dataValueService.addDataValue( createDataValue( dataElementB, periodB, sourceB, "12", optionCombo, optionCombo ) ); // Apr 2000 dataValueService.addDataValue( createDataValue( dataElementB, periodC, sourceB, "13", optionCombo, optionCombo ) ); // May 2000 @@ -1004,7 +989,6 @@ @Test public void testSaveValidationRule() { - // System.out.println("\ntestSaveValidationRule"); int id = validationRuleService.saveValidationRule( validationRuleA ); validationRuleA = validationRuleService.getValidationRule( id ); === modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java' --- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java 2013-12-18 06:05:41 +0000 +++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java 2013-12-30 12:23:52 +0000 @@ -1272,11 +1272,11 @@ } else { - System.out.println( "program name: " + program.getName() ); + //TODO handle } } } - System.out.println( "final size: " + programs.size() ); + return programs; } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateGenericHTTPGateWayConfigAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateGenericHTTPGateWayConfigAction.java 2013-08-23 16:05:01 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateGenericHTTPGateWayConfigAction.java 2013-12-30 12:23:52 +0000 @@ -125,7 +125,6 @@ gatewayConfig.setParameters( map ); gatewayConfig.setName( name ); gatewayConfig.setUrlTemplate( urlTemplate ); - System.out.println("cuc cu: "+urlTemplate); if ( config.getGateways() == null || config.getGateways().isEmpty() ) { === modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/outcoming/ProcessingSendSMSAction.java' --- dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/outcoming/ProcessingSendSMSAction.java 2013-12-13 07:04:37 +0000 +++ dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/outcoming/ProcessingSendSMSAction.java 2013-12-30 12:23:52 +0000 @@ -265,7 +265,6 @@ TaskId taskId = new TaskId( TaskCategory.SENDING_SMS, currentUser ); notifier.clear( taskId ); - System.out.println("text: " + text); sendSmsTask.setTaskId( taskId ); sendSmsTask.setCurrentUser( currentUser ); @@ -278,9 +277,9 @@ if ( message != null && !message.equals( "success" ) ) { message = i18n.getString( message ); - return ERROR; } + if ( message == null ) { message = "An inter error occurs, please contact your administration";