Author: bleny Date: 2010-10-06 19:42:23 +0200 (Wed, 06 Oct 2010) New Revision: 391 Url: http://nuiton.org/repositories/revision/wikitty/391 Log: code style ; javadoc Modified: trunk/src/site/site.xml trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2010-10-05 17:40:50 UTC (rev 390) +++ trunk/src/site/site.xml 2010-10-06 17:42:23 UTC (rev 391) @@ -17,6 +17,8 @@ <item name="TODO" href="todo.html"/> </menu> + <menu ref="modules"/> + <menu ref="reports"/> </body> Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java 2010-10-05 17:40:50 UTC (rev 390) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java 2010-10-06 17:42:23 UTC (rev 391) @@ -36,27 +36,24 @@ void addExtension(List<WikittyExtension> exts); - /** - * check that the wikitty has a metaExtension about a given extension - * @param metaExtension the metaExtension to be checked - * @param extension an extension already added to the wikitty + /** check that the wikitty has a metaExtension about a given extension. + * @param metaExtensionName the metaExtension to be checked + * @param extensionName an extension already added to the wikitty * @since 2.2.0 */ boolean hasMetaExtension(String metaExtensionName, String extensionName); - /** - * add a meta-extension about the given extension to this wikitty + /** add a meta-extension about the given extension to this wikitty. * @param metaExtension the metaExtension to add * @param extension an extension already added to the wikitty * @since 2.1 */ void addMetaExtension(WikittyExtension metaExtension, WikittyExtension extension); - - /** - * add a meta-extension on the given extension to this wikitty + + /** add a meta-extension on the given extension to this wikitty. * @param metaExtension the metaExtension to add * @param extensionFqn the name of the extension already added to the wikitty * @since 2.1 @@ -162,6 +159,7 @@ Set<String> fieldNames(); + /** get the value of and field given its fqn */ Object getFqField(String fqFieldName); String getVersion(); @@ -178,25 +176,22 @@ * @since 2.2.0 */ Set<String> getDirty(); - - /** - * Server only used - * @param version - */ + + /** clear the lists of modified field since last restore. */ void clearDirty(); - /** - * Server only used + /** set the value of a field given is fqn. * @param fieldName fqn (ex: extensionName.fieldName) * @param value new value */ void setFqField(String fieldName, Object value); boolean isEmpty(); - + + /** + * @see Cloneable#clone() + */ Wikitty clone() throws CloneNotSupportedException; - - } \ No newline at end of file Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-10-05 17:40:50 UTC (rev 390) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-10-06 17:42:23 UTC (rev 391) @@ -38,7 +38,7 @@ * for the string "abc{foo|bar}defrzeg{uvw|xyz}oeira" * will match {foo|bar} and {uvw|xyz} with groups for foo, bar, uvw and xyz */ - protected Pattern p = Pattern.compile("\\{(([^|}])*)(?:\\|([^}]*))?\\}"); + protected Pattern toStringTagValuePattern = Pattern.compile("\\{(([^|}])*)(?:\\|([^}]*))?\\}"); /** map "Client.name" to "getName()" or any getter to read this attribute * those getter names are stored while generating in order to be found @@ -406,7 +406,7 @@ // "hello {Person.name|unknow} employe of {Company.name|unknow}" // - Matcher matcher = p.matcher(toStringPattern); + Matcher matcher = toStringTagValuePattern.matcher(toStringPattern); while (matcher.find()) { String wholeMatch = matcher.group(0); // "{foo|bar}"