Author: bleny Date: 2014-07-29 14:09:56 +0200 (Tue, 29 Jul 2014) New Revision: 2177 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2177 Log: refs #4481 fix compilations issues Modified: trunk/wao-persistence/src/main/xmi/wao-model.zargo trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java Modified: trunk/wao-persistence/src/main/xmi/wao-model.zargo =================================================================== (Binary files differ) Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-07-29 11:56:54 UTC (rev 2176) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-07-29 12:09:56 UTC (rev 2177) @@ -203,8 +203,6 @@ Contact contact = new ContactImpl(); - contact.setObsProgram(authenticatedWaoUser.getObsProgram()); - contact.setCreationDate(getNow()); UpdateContactCommand updateContactCommand = new UpdateContactCommand(); @@ -1045,7 +1043,7 @@ // let's try to find a recent similar contact Map<String, Object> properties = new HashMap<>(); - properties.put(Contact.PROPERTY_OBS_PROGRAM_ORDINAL, newContact.getObsProgram().ordinal()); + properties.put(Contact.PROPERTY_SAMPLE_ROW + "." + SampleRow.PROPERTY_OBS_PROGRAM_ORDINAL, newContact.getObsProgram().ordinal()); properties.put(Contact.PROPERTY_SAMPLE_ROW, sampleRow); properties.put(Contact.PROPERTY_MAIN_OBSERVER, observer); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java 2014-07-29 11:56:54 UTC (rev 2176) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java 2014-07-29 12:09:56 UTC (rev 2177) @@ -133,7 +133,6 @@ @Override public Contact newEmptyInstance() { Contact newContact = new ContactImpl(); - newContact.setObsProgram(obsProgram); return newContact; }