Author: echatellier Date: 2014-07-19 12:37:46 +0200 (Sat, 19 Jul 2014) New Revision: 4045 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4045 Log: Ajout de doc. Retrait de code comment?\195?\169. Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectJWeavingAdaptor.java trunk/src/main/java/fr/ifremer/isisfish/aspect/CacheAspect.java trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java trunk/src/main/java/fr/ifremer/isisfish/aspect/TraceAspect.java trunk/src/main/java/fr/ifremer/isisfish/aspect/package-info.java Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectJWeavingAdaptor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectJWeavingAdaptor.java 2014-07-19 10:11:28 UTC (rev 4044) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectJWeavingAdaptor.java 2014-07-19 10:37:46 UTC (rev 4045) @@ -167,7 +167,13 @@ public void prepare() { weaver.prepareForWeave(); } - + + /** + * Cliper/coller de la classe originale {@code WeavingClassFileProvider} car elle n'est pas visible (private). + * + * L'appel à {@code delegateForCurrentClass.getResolvedTypeX().getName()} a été désactivé car c'est quelque chose + * qui est valorisé par l'instrospecteur d'aspect qui n'est pas défini pour IsisFish (aspect runtime). + */ private class WeavingClassFileProvider2 implements IClassFileProvider { private final UnwovenClassFile unwovenClass; Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/CacheAspect.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/CacheAspect.java 2014-07-19 10:11:28 UTC (rev 4044) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/CacheAspect.java 2014-07-19 10:37:46 UTC (rev 4045) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2013 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2014 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -55,12 +55,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(CacheAspect.class); - //@Expression("execution(* scripts..*(..))") - //Pointcut scriptsMethod; - - public CacheAspect() { - } - /** * Return trace object from context. * @@ -85,7 +79,4 @@ } return result; } - } - - Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java 2014-07-19 10:11:28 UTC (rev 4044) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java 2014-07-19 10:37:46 UTC (rev 4045) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 1999 - 2010 Ifremer, Code Lutin + * Copyright (C) 1999 - 2014 Ifremer, Code Lutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -40,9 +40,9 @@ import fr.ifremer.isisfish.types.TimeStep; /** - * Aspect utiliser pour intersepecter les appels a + * Aspect utilisé pour intersepecter les appels a * {@link Rule#init(SimulationContext)}, {@link Rule#preAction(SimulationContext, TimeStep, Metier)}, - * {@link Rule#postAction(SimulationContext, TimeStep, Metier)} et memoriser + * {@link Rule#postAction(SimulationContext, TimeStep, Metier)} et mémoriser * le temps mit. * * @author chatellier @@ -106,6 +106,7 @@ * @param jp join point * @param state state * @throws Throwable + * @return target joint point method result */ protected Object makeTimedCall(ProceedingJoinPoint jp, int state) throws Throwable { @@ -168,8 +169,7 @@ default: break; } - } - else { + } else { if (log.isWarnEnabled()) { log.warn("Time register called outside a simulation context"); } Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/TraceAspect.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/TraceAspect.java 2014-07-19 10:11:28 UTC (rev 4044) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/TraceAspect.java 2014-07-19 10:37:46 UTC (rev 4045) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric + * Copyright (C) 2006 - 2014 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -36,7 +36,6 @@ import fr.ifremer.isisfish.simulator.SimulationContext; import org.nuiton.profiling.Trace; -//import fr.ifremer.isisfish.util.Trace; /** * Permet de tracer les appels aux methodes utilisateur ainsi que l'execution @@ -55,16 +54,6 @@ @Aspect public class TraceAspect { - /*@Pointcut("execution(* scripts..*(..))" - + " || execution(* simulators..*(..))" - + " || execution(* rules..*(..)) " - + " || execution(* simulationplans..*(..)) " - + " || execution(* formules..*(..))") - Pointcut executeMethod;*/ - - public TraceAspect() { - } - /** * Return trace object from context. * Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/package-info.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/package-info.java 2014-07-19 10:11:28 UTC (rev 4044) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/package-info.java 2014-07-19 10:37:46 UTC (rev 4045) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 1999 - 2013 Ifremer, CodeLutin, Chatellier Eric + * Copyright (C) 1999 - 2014 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -33,4 +33,3 @@ * </ul> */ package fr.ifremer.isisfish.aspect; -