Index: topia/src/java/org/codelutin/topia/annotation/MethodType.java diff -u topia/src/java/org/codelutin/topia/annotation/MethodType.java:1.1 topia/src/java/org/codelutin/topia/annotation/MethodType.java:1.2 --- topia/src/java/org/codelutin/topia/annotation/MethodType.java:1.1 Tue Jul 19 13:15:13 2005 +++ topia/src/java/org/codelutin/topia/annotation/MethodType.java Wed Aug 3 16:10:06 2005 @@ -23,10 +23,10 @@ * Created: 19 juillet 2005 12:41:50 CEST * * @author Benjamin POUSSIN - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Last update: $Date: 2005/07/19 13:15:13 $ - * by : $Author: bpoussin $ + * Last update: $Date: 2005/08/03 16:10:06 $ + * by : $Author: thimel $ */ package org.codelutin.topia.annotation; @@ -38,7 +38,9 @@ /** methode qui provient du diagramme initial */ OPERATION, /** methode genere pour les besoins du framework */ - GENERATED + GENERATED, + /** methode définie hors-framework (toString, ...) */ + DEFAULT_OPERATION } // MethodType Index: topia/src/java/org/codelutin/topia/annotation/MethodInfoHelper.java diff -u topia/src/java/org/codelutin/topia/annotation/MethodInfoHelper.java:1.2 topia/src/java/org/codelutin/topia/annotation/MethodInfoHelper.java:1.3 --- topia/src/java/org/codelutin/topia/annotation/MethodInfoHelper.java:1.2 Tue Jul 26 14:32:06 2005 +++ topia/src/java/org/codelutin/topia/annotation/MethodInfoHelper.java Wed Aug 3 16:10:06 2005 @@ -23,10 +23,10 @@ * Created: 20 juillet 2005 13:01:19 CEST * * @author Benjamin POUSSIN - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ * - * Last update: $Date: 2005/07/26 14:32:06 $ - * by : $Author: bpoussin $ + * Last update: $Date: 2005/08/03 16:10:06 $ + * by : $Author: thimel $ */ package org.codelutin.topia.annotation; @@ -41,14 +41,14 @@ static private Logger log = Logger.getLogger("org.codelutin.topia.annotation.MethodInfoHelper"); @MethodInfo - protected static MethodInfo getInfo(Method method){ + public static MethodInfo getInfo(Method method){ MethodInfo info = method.getAnnotation(MethodInfo.class); if(info == null){ try{ method = MethodInfoHelper.class.getMethod("getInfo", Method.class); }catch(NoSuchMethodException eee){ // normalement ne doit pas survenir, car on est dans cette methode - throw new RuntimeException("Erreur inatendu, on recherchait la methode dans lequel on est"); + throw new RuntimeException("Erreur inatendu, on recherchait la methode dans lequel on est", eee); } info = method.getAnnotation(MethodInfo.class); } Index: topia/src/java/org/codelutin/topia/annotation/MethodInfo.java diff -u topia/src/java/org/codelutin/topia/annotation/MethodInfo.java:1.5 topia/src/java/org/codelutin/topia/annotation/MethodInfo.java:1.6 --- topia/src/java/org/codelutin/topia/annotation/MethodInfo.java:1.5 Tue Jul 26 14:32:06 2005 +++ topia/src/java/org/codelutin/topia/annotation/MethodInfo.java Wed Aug 3 16:10:06 2005 @@ -23,10 +23,10 @@ * Created: 19 juillet 2005 12:36:01 CEST * * @author Benjamin POUSSIN - * @version $Revision: 1.5 $ + * @version $Revision: 1.6 $ * - * Last update: $Date: 2005/07/26 14:32:06 $ - * by : $Author: bpoussin $ + * Last update: $Date: 2005/08/03 16:10:06 $ + * by : $Author: thimel $ */ package org.codelutin.topia.annotation; @@ -40,7 +40,7 @@ @Target(ElementType.METHOD) public @interface MethodInfo { // MethodInfo /** le type de methode */ - MethodType type() default MethodType.OPERATION; + MethodType type() default MethodType.DEFAULT_OPERATION; /** si type vaut FIELD_ACCESSOR alors indique si la methode est une methode de modification de la valeur du champs sur lequel travail la méthode */ boolean isFieldModifier() default false;