=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/SMSCommand.java' --- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/SMSCommand.java 2013-02-26 07:47:48 +0000 +++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/SMSCommand.java 2013-03-13 07:44:25 +0000 @@ -8,7 +8,7 @@ public class SMSCommand implements DataStreamSerializable { - private String parserType; + private String name; private String separator; @@ -48,14 +48,14 @@ // does not exist in version 2.9 } - public String getParserType() + public String getName() { - return parserType; + return name; } - public void setParserType( String parserType ) + public void setName( String name ) { - this.parserType = parserType; + this.name = name; } public String getSeparator() @@ -112,7 +112,7 @@ public void serializeVersion2_10( DataOutputStream dataOutputStream ) throws IOException { - dataOutputStream.writeUTF( this.parserType ); + dataOutputStream.writeUTF( this.name ); if ( this.separator != null ) { dataOutputStream.writeUTF( this.separator ); === modified file 'dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileOrganisationUnitController.java' --- dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileOrganisationUnitController.java 2013-03-11 09:51:00 +0000 +++ dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileOrganisationUnitController.java 2013-03-13 07:44:25 +0000 @@ -288,7 +288,7 @@ { return activityReportingService.saveProgramStage( programStage ); } - + @RequestMapping( method = RequestMethod.GET, value = "{clientVersion}/LWUIT/orgUnits/{id}/enrollProgram" ) @ResponseBody public Patient enrollProgram( @PathVariable int id, @RequestHeader( "enrollInfo" ) String enrollInfo ) @@ -321,19 +321,19 @@ { SMSCommand mobileSMSCommand = new SMSCommand(); List smsCodes = new ArrayList(); - - mobileSMSCommand.setParserType( normalSMSCommand.getParserType().name() ); + + mobileSMSCommand.setName( normalSMSCommand.getName() ); mobileSMSCommand.setCodeSeparator( normalSMSCommand.getCodeSeparator() ); mobileSMSCommand.setDataSetId( normalSMSCommand.getDataset().getId() ); mobileSMSCommand.setSeparator( normalSMSCommand.getSeparator() ); - + for ( org.hisp.dhis.smscommand.SMSCode normalSMSCode : normalSMSCommand.getCodes() ) { SMSCode smsCode = new SMSCode(); - + smsCode.setCode( normalSMSCode.getCode() ); smsCode.setDataElementId( normalSMSCode.getDataElement().getId() ); - smsCode.setOptionId( normalSMSCode.getOptionId()); + smsCode.setOptionId( normalSMSCode.getOptionId() ); smsCodes.add( smsCode ); } mobileSMSCommand.setSmsCodes( smsCodes );