=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/MobileModel.java' --- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/MobileModel.java 2013-02-26 07:47:48 +0000 +++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/MobileModel.java 2013-03-19 08:20:05 +0000 @@ -33,7 +33,6 @@ import java.util.Collection; import java.util.Date; import java.util.List; - import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement === modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/MobileOrgUnitLinks.java' --- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/MobileOrgUnitLinks.java 2013-03-08 10:55:15 +0000 +++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/MobileOrgUnitLinks.java 2013-03-19 08:20:05 +0000 @@ -223,7 +223,7 @@ { this.enrollProgramUrl = enrollProgramUrl; } - + public String getRegisterPersonUrl() { return registerPersonUrl; @@ -304,7 +304,7 @@ dataOutputStream.writeUTF( this.changeUpdateDataSetLangUrl ); dataOutputStream.writeUTF( this.searchUrl ); dataOutputStream.writeUTF( this.updateNewVersionUrl ); - dataOutputStream.writeUTF( this.updateContactUrl ); + // dataOutputStream.writeUTF( this.updateContactUrl ); } @Override === modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/OrgUnits.java' --- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/OrgUnits.java 2013-03-11 03:39:47 +0000 +++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/OrgUnits.java 2013-03-19 08:20:05 +0000 @@ -77,13 +77,6 @@ public void serialize( DataOutputStream dataOutputStream ) throws IOException { - // send the current version to client for updating or not - // dataOutputStream.writeDouble( MobileOrgUnitLinks.currentVersion ); - // dataOutputStream.writeInt( orgUnits.size() ); - // for ( MobileOrgUnitLinks unit : orgUnits ) - // { - // unit.serialize( dataOutputStream ); - // } if ( this.getClientVersion().equals( DataStreamSerializable.TWO_POINT_EIGHT ) ) { this.serializeVersion2_8( dataOutputStream ); @@ -136,7 +129,6 @@ { unit.serializeVersion2_9( dataOutputStream ); } - } @Override === modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/PeriodUtil.java' --- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/PeriodUtil.java 2011-11-04 11:27:33 +0000 +++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/PeriodUtil.java 2013-03-19 08:20:05 +0000 @@ -42,7 +42,6 @@ public class PeriodUtil { - public static Period getPeriod( String periodName, PeriodType periodType ) throws IllegalArgumentException { === 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 2013-03-13 10:11:52 +0000 +++ dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileClientController.java 2013-03-19 08:20:05 +0000 @@ -98,9 +98,10 @@ unitList.add( getOrgUnit( unit, request ) ); } OrgUnits orgUnits = new OrgUnits( unitList ); - orgUnits.setClientVersion( version ); + orgUnits.setClientVersion( DataStreamSerializable.TWO_POINT_NINE ); return orgUnits; } + @RequestMapping( method = RequestMethod.GET, value = "/{version}/LWUIT" ) @ResponseBody public OrgUnits getOrgUnitsForUserLWUIT( HttpServletRequest request, @PathVariable String version )