Author: acheype Date: 2013-02-18 10:09:45 +0100 (Mon, 18 Feb 2013) New Revision: 121 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/121 Log: Remove some warnings Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java trunk/cantharella.utils/src/main/java/nc/ird/cantharella/utils/BeanLookup.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java 2013-02-18 08:20:31 UTC (rev 120) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java 2013-02-18 09:09:45 UTC (rev 121) @@ -106,16 +106,6 @@ private static final int DB_CONNECTION_ACQUIRE_RETRY_DELAY = 1000; /** - * DB pool: acquire increment - */ - private static final int DB_POOL_ACQUIRE_INCREMENT = 3; - - /** - * DB pool: max size - */ - private static final int DB_POOL_MAX_SIZE = 15; - - /** * DB pool: min size */ private static final int DB_POOL_MIN_SIZE = 3; Modified: trunk/cantharella.utils/src/main/java/nc/ird/cantharella/utils/BeanLookup.java =================================================================== --- trunk/cantharella.utils/src/main/java/nc/ird/cantharella/utils/BeanLookup.java 2013-02-18 08:20:31 UTC (rev 120) +++ trunk/cantharella.utils/src/main/java/nc/ird/cantharella/utils/BeanLookup.java 2013-02-18 09:09:45 UTC (rev 121) @@ -24,44 +24,45 @@ import nc.ird.cantharella.utils.BeanTools.AccessType; -import org.apache.commons.lang3.text.StrLookup; - /** * Retrieve a bean field value from the bean field name + * * @author Mickael Tricot * @author Adrien Cheype */ -public final class BeanLookup extends StrLookup { +public final class BeanLookup { - /** Access type */ - private final AccessType accessType; + /** Access type */ + private final AccessType accessType; - /** Bean */ - private final Object bean; + /** Bean */ + private final Object bean; - /** - * Constructor - * @param bean Bean - * @param accessType Access type - */ - public BeanLookup(Object bean, AccessType accessType) { - super(); - AssertTools.assertNotNull(bean); - AssertTools.assertNotNull(accessType); - this.bean = bean; - this.accessType = accessType; - } + /** + * Constructor + * + * @param bean + * Bean + * @param accessType + * Access type + */ + public BeanLookup(Object bean, AccessType accessType) { + super(); + AssertTools.assertNotNull(bean); + AssertTools.assertNotNull(accessType); + this.bean = bean; + this.accessType = accessType; + } - /** {@inheritDoc} */ - @Override - public String lookup(String key) { - AssertTools.assertNotNull(key); - Object value; - try { - value = BeanTools.getValue(bean, accessType, key); - } catch (IllegalArgumentException e) { - value = null; + /** {@inheritDoc} */ + public String lookup(String key) { + AssertTools.assertNotNull(key); + Object value; + try { + value = BeanTools.getValue(bean, accessType, key); + } catch (IllegalArgumentException e) { + value = null; + } + return value != null ? value.toString() : null; } - return value != null ? value.toString() : null; - } } \ No newline at end of file Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java 2013-02-18 08:20:31 UTC (rev 120) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java 2013-02-18 09:09:45 UTC (rev 121) @@ -132,10 +132,6 @@ /** Campagnes */ private final List<Campagne> campagnes; - /** Service : personne */ - @SpringBean - private PersonneService personneService; - /** Service : campagne */ @SpringBean private CampagneService campagneService;