Author: tchemit Date: 2010-11-29 00:49:23 +0100 (Mon, 29 Nov 2010) New Revision: 1016 Url: http://nuiton.org/repositories/revision/eugene/1016 Log: add since + fix test Modified: trunk/eugene/src/main/java/org/nuiton/eugene/ModelPropertiesUtil.java trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java trunk/eugene/src/test/java/org/nuiton/eugene/EugeneModelPropertiesProviderTest.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/ModelPropertiesUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/ModelPropertiesUtil.java 2010-11-28 23:16:57 UTC (rev 1015) +++ trunk/eugene/src/main/java/org/nuiton/eugene/ModelPropertiesUtil.java 2010-11-28 23:49:23 UTC (rev 1016) @@ -85,7 +85,7 @@ */ public static class AggregateModelPropertiesProvider extends ModelPropertiesProvider { - ClassLoader loader; + protected ClassLoader loader; public AggregateModelPropertiesProvider(ClassLoader loader) { this.loader = loader; @@ -94,7 +94,8 @@ @Override protected void init() throws Exception { ServiceLoader<ModelPropertiesProvider> loader; - loader = ServiceLoader.load(ModelPropertiesProvider.class, this.loader); + loader = ServiceLoader.load(ModelPropertiesProvider.class, + this.loader); for (ModelPropertiesProvider provider : loader) { if (log.isInfoEnabled()) { log.info("Will init model properties provider " + provider); Modified: trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java 2010-11-28 23:16:57 UTC (rev 1015) +++ trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java 2010-11-28 23:49:23 UTC (rev 1016) @@ -48,8 +48,10 @@ /** date de derniere modification de la source la plus recente */ protected long lastModifiedSource; + /** @since 2.3 */ protected boolean verbose; - + + /** @since 2.3 */ protected ClassLoader loader; public boolean isVerbose() { @@ -82,9 +84,7 @@ } } - /** - * @return the last modified file source (says the newer incoming file) - */ + /** @return the last modified file source (says the newer incoming file) */ public long getLastModifiedSource() { return lastModifiedSource; } Modified: trunk/eugene/src/test/java/org/nuiton/eugene/EugeneModelPropertiesProviderTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/EugeneModelPropertiesProviderTest.java 2010-11-28 23:16:57 UTC (rev 1015) +++ trunk/eugene/src/test/java/org/nuiton/eugene/EugeneModelPropertiesProviderTest.java 2010-11-28 23:49:23 UTC (rev 1016) @@ -1,7 +1,7 @@ package org.nuiton.eugene; import org.junit.Assert; -import org.junit.BeforeClass; +import org.junit.Before; import org.junit.Test; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAttribute; @@ -17,9 +17,10 @@ protected ModelPropertiesUtil.ModelPropertiesProvider provider; - @BeforeClass - public void setUp() { + @Before + public void setUp() throws Exception { provider = new ModelPropertiesUtil.EugeneModelPropertiesProvider(); + provider.init(); } @Test