Author: tchemit Date: 2013-02-05 16:02:50 +0100 (Tue, 05 Feb 2013) New Revision: 337 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/337 Log: fix api Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2013-02-05 14:46:18 UTC (rev 336) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2013-02-05 15:02:50 UTC (rev 337) @@ -382,6 +382,8 @@ @Override public List<Species> importTemporarySpecies(List<Species> species) { + + List<Species> result = Lists.newArrayListWithCapacity(species.size()); Status status = new Status(); status.setId("2"); @@ -389,12 +391,15 @@ for (Species toCreate : species) { Species created = create(name, toCreate, false); created.setStatus(status); + result.add(created); } persistToFile(name); + return result; } @Override public List<Vessel> importTemporaryVessel(List<Vessel> vessels) { + List<Vessel> result = Lists.newArrayListWithCapacity(vessels.size()); Status status = new Status(); status.setId("2"); @@ -408,13 +413,16 @@ created = create(nameFishing, toCreate, false); } created.setStatus(status); + result.add(created); } persistToFile(nameScientific); persistToFile(nameFishing); + return result; } @Override public List<Person> importTemporaryPerson(List<Person> persons) { + List<Person> result = Lists.newArrayListWithCapacity(persons.size()); Status status = new Status(); status.setId("2"); @@ -422,12 +430,15 @@ for (Person toCreate : persons) { Person created = create(name, toCreate, false); created.setStatus(status); + result.add(created); } persistToFile(name); + return result; } @Override public List<Gear> importTemporaryGear(List<Gear> gears) { + List<Gear> result = Lists.newArrayListWithCapacity(gears.size()); Status status = new Status(); status.setId("2"); @@ -441,9 +452,11 @@ created = create(nameFishing, toCreate, false); } created.setStatus(status); + result.add(created); } persistToFile(nameScientific); persistToFile(nameFishing); + return result; } //------------------------------------------------------------------------// Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-02-05 14:46:18 UTC (rev 336) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-02-05 15:02:50 UTC (rev 337) @@ -61,7 +61,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; import java.io.IOException; import java.util.List; @@ -288,27 +287,23 @@ } @Override - @Transactional(readOnly = false) - public void importTemporarySpecies(List<Species> species) { - referentialService.importTemporarySpecies(species); + public List<Species> importTemporarySpecies(List<Species> species) { + return referentialService.importTemporarySpecies(species); } @Override - @Transactional(readOnly = false) - public void importTemporaryVessel(List<Vessel> vessels) { - referentialService.importTemporaryVessel(vessels); + public List<Vessel> importTemporaryVessel(List<Vessel> vessels) { + return referentialService.importTemporaryVessel(vessels); } @Override - @Transactional(readOnly = false) - public void importTemporaryPerson(List<Person> persons) { - referentialService.importTemporaryPerson(persons); + public List<Person> importTemporaryPerson(List<Person> persons) { + return referentialService.importTemporaryPerson(persons); } @Override - @Transactional(readOnly = false) - public void importTemporaryGear(List<Gear> gears) { - referentialService.importTemporaryGear(gears); + public List<Gear> importTemporaryGear(List<Gear> gears) { + return referentialService.importTemporaryGear(gears); } //------------------------------------------------------------------------// Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java 2013-02-05 14:46:18 UTC (rev 336) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java 2013-02-05 15:02:50 UTC (rev 337) @@ -69,23 +69,23 @@ "- !SpeciesProtocol\n" + " id: 1\n" + " calcifySampleEnabled: true\n" + - " surveyCode: BAR\n" + " lengthStepPmfmId: 1394\n" + " maturityEnabled: true\n" + " sexEnabled: true\n" + " speciesId: 11242\n" + + " surveyCode: BAR\n" + " weightEnabled: true\n" + "- !SpeciesProtocol\n" + " id: 2\n" + " ageEnabled: true\n" + " calcifySampleEnabled: true\n" + " countIfNoFrequencyEnabled: true\n" + - " surveyCode: CHIN\n" + " lengthStepPmfmId: 323\n" + " maturityEnabled: true\n" + " sexEnabled: true\n" + " sizeEnabled: true\n" + " speciesId: 3835\n" + + " surveyCode: CHIN\n" + " weightEnabled: true"; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java 2013-02-05 14:46:18 UTC (rev 336) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java 2013-02-05 15:02:50 UTC (rev 337) @@ -42,7 +42,7 @@ public static final String PROPERTY_ID = "id"; - public static final String PROPERTY_CRUISE_CODE = "surveyCode"; + public static final String PROPERTY_SURVEY_CODE = "surveyCode"; public static final String PROPERTY_SPECIES = "species"; @@ -184,11 +184,11 @@ return delegate.getSpeciesId(); } - public String getCruiseCode() { + public String getSurveyCode() { return delegate.getSurveyCode(); } - public void setCruiseCode(String cruiseCode) { - delegate.setSurveyCode(cruiseCode); + public void setSurveyCode(String surveyCode) { + delegate.setSurveyCode(surveyCode); } } \ No newline at end of file Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2013-02-05 14:46:18 UTC (rev 336) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2013-02-05 15:02:50 UTC (rev 337) @@ -63,7 +63,7 @@ newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_FRACTION_NAME); newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_METHOD_NAME); - newMandatoryColumn(SpeciesRow.PROPERTY_CRUISE_CODE, new TuttiCsvUtil.StringParserFormatter(null,true)); + newMandatoryColumn(SpeciesRow.PROPERTY_SURVEY_CODE, new TuttiCsvUtil.StringParserFormatter(null,true)); newMandatoryColumn(SpeciesRow.PROPERTY_SIZE_ENABLED, Common.PRIMITIVE_BOOLEAN); newMandatoryColumn(SpeciesRow.PROPERTY_SEX_ENABLED, Common.PRIMITIVE_BOOLEAN); newMandatoryColumn(SpeciesRow.PROPERTY_MATURITY_ENABLED, Common.PRIMITIVE_BOOLEAN); @@ -75,7 +75,7 @@ // export definition newColumnForExport(SpeciesRow.PROPERTY_ID); - newColumnForExport(SpeciesRow.PROPERTY_CRUISE_CODE); + newColumnForExport(SpeciesRow.PROPERTY_SURVEY_CODE); newColumnForExport(SpeciesRow.PROPERTY_LENGTH_STEP, SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_ID); newColumnForExport(SpeciesRow.PROPERTY_LENGTH_STEP_PARAMETER_NAME); newColumnForExport(SpeciesRow.PROPERTY_LENGTH_STEP_MATRIX_NAME); Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-02-05 14:46:18 UTC (rev 336) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-02-05 15:02:50 UTC (rev 337) @@ -35,10 +35,12 @@ tutti.property.species=Espèce tutti.property.stationNumber=Numéro de station tutti.property.strata=Strate d'association +tutti.property.surveyCode= tutti.property.user=Utilisateur tutti.property.vessel=Navire tutti.property.zone=Zone tutti.propety.no.species.cruiseCode=\# +tutti.propety.no.species.surveyCode= tutti.propety.no.vessel.internalRegistrationCode=Immatriculation inconnu tutti.propety.no.vessel.name=Nom inconnu tutti.service.config=Configuration des services de Tutti Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java 2013-02-05 14:46:18 UTC (rev 336) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java 2013-02-05 15:02:50 UTC (rev 337) @@ -82,11 +82,11 @@ "species: \n" + "- !SpeciesProtocol\n" + " calcifySampleEnabled: true\n" + - " surveyCode: cruiseCode1\n" + " lengthStepPmfmId: 1394\n" + " maturityEnabled: true\n" + " sexEnabled: true\n" + " speciesId: 11242\n" + + " surveyCode: cruiseCode1\n" + " weightEnabled: true\n" + "- !SpeciesProtocol\n" + " ageEnabled: true\n" + Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-05 14:46:18 UTC (rev 336) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-05 15:02:50 UTC (rev 337) @@ -341,6 +341,8 @@ tutti.table.protocol.species.header.size.tip=Catégorisation sur la catégorie de tri ? tutti.table.protocol.species.header.speciesId=Espèce tutti.table.protocol.species.header.speciesId.tip=Espèce (code permanent - nom scientifique) +tutti.table.protocol.species.header.surveyCode= +tutti.table.protocol.species.header.surveyCode.tip= tutti.table.protocol.species.header.weight=Pesée tutti.table.protocol.species.header.weight.tip=Pesée tutti.table.species.batch.header.ageCategory=Age