dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5352
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-12-09 22:21:03 +0100
message:
  Removed unused imports
removed:
  dhis-2/dhis-web/dhis-web-api-mobile/src/test/java/org/hisp/dhis/api/mobile/controller/
  dhis-2/dhis-web/dhis-web-api-mobile/src/test/java/org/hisp/dhis/api/mobile/controller/ActivityPlanTest.java
modified:
  dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/AbstractMobileController.java
  dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileClientController.java
  dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/GetDataSetsAction.java
  dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/GetSectionFormAction.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-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/AbstractMobileController.java'
--- dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/AbstractMobileController.java	2011-11-29 12:06:35 +0000
+++ dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/AbstractMobileController.java	2011-12-09 21:21:03 +0000
@@ -16,5 +16,4 @@
         response.setContentType( "text/plain" );
         response.getWriter().write( exception.getReason() );
     }
-
 }

=== modified file 'dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileClientController.java'
--- dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileClientController.java	2011-11-29 12:06:35 +0000
+++ dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileClientController.java	2011-12-09 21:21:03 +0000
@@ -23,7 +23,6 @@
 @RequestMapping( value = "/mobile" )
 public class MobileClientController extends AbstractMobileController
 {
-
     @Autowired
     private CurrentUserService currentUserService;
 
@@ -75,7 +74,5 @@
         url = url.substring( 0, url.indexOf( base ) + base.length() );
 
         return url + "/orgUnits/" + id + "/" + path;
-
     }
-
 }

=== removed directory 'dhis-2/dhis-web/dhis-web-api-mobile/src/test/java/org/hisp/dhis/api/mobile/controller'
=== removed file 'dhis-2/dhis-web/dhis-web-api-mobile/src/test/java/org/hisp/dhis/api/mobile/controller/ActivityPlanTest.java'
--- dhis-2/dhis-web/dhis-web-api-mobile/src/test/java/org/hisp/dhis/api/mobile/controller/ActivityPlanTest.java	2011-11-29 12:06:35 +0000
+++ dhis-2/dhis-web/dhis-web-api-mobile/src/test/java/org/hisp/dhis/api/mobile/controller/ActivityPlanTest.java	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-package org.hisp.dhis.api.mobile.controller;
-
-import static org.junit.Assert.*;
-
-import org.hisp.dhis.api.mobile.model.MobileModel;
-import org.hisp.dhis.dataset.DataSetService;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-//@RunWith( SpringJUnit4ClassRunner.class )
-//@ContextConfiguration( locations = { "classpath*:/META-INF/dhis/beans.xml", "classpath*:/META-INF/dhis/servlet.xml" } )
-//@Transactional
-public class ActivityPlanTest
-{
-
-//    @Autowired
-//    private MobileOrganisationUnitController controller;
-//    
-//    @Autowired
-//    private DataSetService dataSetService;
-//    
-//    @Test
-//    public void testActivityPlan() {
-//
-//        dataSetService.getDataSetsForMobile( source )
-//        
-//        MobileModel model = controller.getAllDataForOrgUnit( 525, "en_UK" );
-//
-//        assertNotNull(model);
-//
-//        System.out.println(model.getDatasets());
-//    }
-}

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/GetDataSetsAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/GetDataSetsAction.java	2011-12-08 16:02:16 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/GetDataSetsAction.java	2011-12-09 21:21:03 +0000
@@ -29,13 +29,11 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 
 import org.hisp.dhis.dataset.DataSet;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.organisationunit.OrganisationUnitService;
 import org.hisp.dhis.user.CurrentUserService;
-import org.hisp.dhis.user.User;
 import org.hisp.dhis.user.UserCredentials;
 import org.springframework.beans.factory.annotation.Required;
 
@@ -108,7 +106,6 @@
             {
                 dataSets.retainAll( userCredentials.getAllDataSets() );
             }
-
         }
 
         return SUCCESS;

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/GetSectionFormAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/GetSectionFormAction.java	2011-12-08 16:03:30 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/GetSectionFormAction.java	2011-12-09 21:21:03 +0000
@@ -32,7 +32,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.hisp.dhis.dataelement.DataElementCategoryCombo;
 import org.hisp.dhis.dataelement.DataElementOperand;
 import org.hisp.dhis.dataset.CompleteDataSetRegistration;
 import org.hisp.dhis.dataset.CompleteDataSetRegistrationService;
@@ -233,7 +232,6 @@
                 greyedFields.put( operand.getDataElement().getId() + ":" + operand.getCategoryOptionCombo().getId(),
                     true );
             }
-        }
-        
+        }        
     }
 }