Author: echatellier Date: 2013-12-01 22:35:20 +0100 (Sun, 01 Dec 2013) New Revision: 3866 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3866 Log: Fix trunk compilation Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/CacheAspect.java trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java trunk/src/main/java/fr/ifremer/isisfish/util/IsisCache.java Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/CacheAspect.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/CacheAspect.java 2013-12-01 21:26:43 UTC (rev 3865) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/CacheAspect.java 2013-12-01 21:35:20 UTC (rev 3866) @@ -39,7 +39,7 @@ import org.codehaus.aspectwerkz.joinpoint.MethodSignature; import fr.ifremer.isisfish.simulator.SimulationContext; -import fr.ifremer.isisfish.util.Cache; +import fr.ifremer.isisfish.util.IsisCache; /** * CacheAspect aspect. @@ -69,9 +69,9 @@ * * @return trace object from context */ - protected Cache getCache() { + protected IsisCache getCache() { SimulationContext context = SimulationContext.get(); - Cache result = context.getCache(); + IsisCache result = context.getCache(); return result; } Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2013-12-01 21:26:43 UTC (rev 3865) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2013-12-01 21:35:20 UTC (rev 3866) @@ -40,7 +40,7 @@ import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityUtils; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.util.Cache; +import fr.ifremer.isisfish.util.IsisCache; import fr.ifremer.isisfish.util.Trace; /** @@ -78,7 +78,7 @@ /** l'objet trace qui conserve les donnees statistiques des appels de methodes */ protected Trace trace; /** cache used by aspect for this simulation */ - protected Cache cache; + protected IsisCache cache; /** TopiaContext must be used by rule action to modify data */ protected TopiaContext db = null; @@ -208,10 +208,11 @@ return trace; } - public Cache getCache() { + public IsisCache getCache() { if (cache == null) { - cache = new Cache(); - }return cache; + cache = new IsisCache(); + } + return cache; } /** Modified: trunk/src/main/java/fr/ifremer/isisfish/util/IsisCache.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/IsisCache.java 2013-12-01 21:26:43 UTC (rev 3865) +++ trunk/src/main/java/fr/ifremer/isisfish/util/IsisCache.java 2013-12-01 21:35:20 UTC (rev 3866) @@ -49,7 +49,7 @@ /** * to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(IsisCacheAbstract.class); + static private Log log = LogFactory.getLog(IsisCache.class); static public IsisCacheBackend.Factory defaultFactory = IsisCacheBackendOnGuava.factory;