Author: chatellier Date: 2009-07-20 13:38:55 +0000 (Mon, 20 Jul 2009) New Revision: 2507 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/Doc.java isis-fish/trunk/src/main/resources/templates/script/export.ftl isis-fish/trunk/src/main/resources/templates/script/sensitivity.ftl Log: @Doc annotation is now field target only. Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-07-17 13:29:26 UTC (rev 2506) +++ isis-fish/trunk/changelog.txt 2009-07-20 13:38:55 UTC (rev 2507) @@ -1,9 +1,11 @@ isis-fish (3.2.0.5) stable; urgency=low + * @Doc annotation is now only field target * Fix creation group assistant's labels * Improve simulation summary * #1905 : nom des labels pour somme par année + -- isis-fish (3.2.0.5-rc1) stable; urgency=low Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/Doc.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/Doc.java 2009-07-17 13:29:26 UTC (rev 2506) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/Doc.java 2009-07-20 13:38:55 UTC (rev 2507) @@ -18,6 +18,11 @@ package fr.ifremer.isisfish.util; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + /** * Used by user to add informations about a code he wrote. * @@ -27,31 +32,34 @@ * Last update : $Date$ * By : $Author$ */ - at java.lang.annotation.Retention(value = - java.lang.annotation.RetentionPolicy.RUNTIME) - at java.lang.annotation.Target(value = { - java.lang.annotation.ElementType.FIELD, - java.lang.annotation.ElementType.TYPE - }) + at Retention(value = RetentionPolicy.RUNTIME) + at Target(value = { ElementType.FIELD }) public @interface Doc { - + /** + * Get content of the documentation. * * @return the content of the documentation */ String value(); /** + * Get documentation date (optional). + * * @return optional date */ String date() default ""; /** + * Get documentation version (optional). + * * @return optional version */ String version() default ""; /** + * Get documentation author (optional). + * * @return optional author of the documentation */ String author() default ""; Modified: isis-fish/trunk/src/main/resources/templates/script/export.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/script/export.ftl 2009-07-17 13:29:26 UTC (rev 2506) +++ isis-fish/trunk/src/main/resources/templates/script/export.ftl 2009-07-20 13:38:55 UTC (rev 2507) @@ -41,8 +41,7 @@ } public String getExportFilename() { - // remove _(...) if you don''t want translation on filename - return _("${name}"); + return "${name}"; } public String getExtensionFilename() { Modified: isis-fish/trunk/src/main/resources/templates/script/sensitivity.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/script/sensitivity.ftl 2009-07-17 13:29:26 UTC (rev 2506) +++ isis-fish/trunk/src/main/resources/templates/script/sensitivity.ftl 2009-07-20 13:38:55 UTC (rev 2507) @@ -27,7 +27,6 @@ * Last update: $Date: ${date?date?string.long} $ * by : $Author: ${author} $ */ - at Doc("TODO Doc for ${name} SensitivityCalculator") public class ${name} extends AbstractSensitivityCalculator { /** to use log facility, just put in your code: log.info("..."); */