Author: tchemit Date: 2013-02-27 08:08:59 +0100 (Wed, 27 Feb 2013) New Revision: 487 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/487 Log: fixes #2062: [ESPECE] Sauvegarge de mensuration impossible Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-02-26 17:54:09 UTC (rev 486) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-02-27 07:08:59 UTC (rev 487) @@ -44,8 +44,6 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.persistence.entities.referential.Zone; -import org.hibernate.event.EvictEvent; -import org.springframework.cache.annotation.CacheEvict; import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -67,6 +65,7 @@ /** * To clear all caches. + * * @since 1.0.1 */ void clearAllCaches(); @@ -177,6 +176,12 @@ */ List<Caracteristic> getAllCaracteristic(); + /** + * @return all numeric caracteristics of the system. + * @since 1.0.2 + */ + List<Caracteristic> getAllNumericCaracteristic(); + Caracteristic getSizeCategoryCaracteristic(); Caracteristic getSexCaracteristic(); 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-26 17:54:09 UTC (rev 486) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-02-27 07:08:59 UTC (rev 487) @@ -251,6 +251,11 @@ } @Override + public List<Caracteristic> getAllNumericCaracteristic() { + return referentialService.getAllNumericCaracteristic(); + } + + @Override public Caracteristic getSizeCategoryCaracteristic() { return referentialService.getSizeCategoryCaracteristic(); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2013-02-26 17:54:09 UTC (rev 486) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2013-02-27 07:08:59 UTC (rev 487) @@ -122,6 +122,11 @@ } @Override + public List<Caracteristic> getAllNumericCaracteristic() { + throw new RuntimeException("method not implemented"); + } + + @Override public Caracteristic getSizeCategoryCaracteristic() { throw new RuntimeException("method not implemented"); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-02-26 17:54:09 UTC (rev 486) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-02-27 07:08:59 UTC (rev 487) @@ -163,6 +163,12 @@ */ List<Caracteristic> getAllCaracteristic(); + /** + * @return all numeric caracteristics of the system. + * @since 1.0.2 + */ + List<Caracteristic> getAllNumericCaracteristic(); + Caracteristic getSizeCategoryCaracteristic(); Caracteristic getSexCaracteristic(); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-02-26 17:54:09 UTC (rev 486) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-02-27 07:08:59 UTC (rev 487) @@ -450,6 +450,18 @@ } @Override + public List<Caracteristic> getAllNumericCaracteristic() { + List<Caracteristic> result = Lists.newArrayList(); + + for (Caracteristic caracteristic : getAllCaracteristic()) { + if (caracteristic.isNumericType()) { + result.add(caracteristic); + } + } + return result; + } + + @Override public Caracteristic getSizeCategoryCaracteristic() { Integer pmfmId = enumeration.PMFM_ID_SIZE_CATEGORY; Caracteristic result = getCaracteristic(pmfmId); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-02-26 17:54:09 UTC (rev 486) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-02-27 07:08:59 UTC (rev 487) @@ -177,6 +177,11 @@ } @Override + public List<Caracteristic> getAllNumericCaracteristic() { + return driver.getAllNumericCaracteristic(); + } + + @Override public List<Zone> getAllProgramZone() { return driver.getAllProgramZone(); }