Author: fdesbois Date: 2009-11-07 18:41:17 +0100 (Sat, 07 Nov 2009) New Revision: 710 Modified: branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java Log: Improve documentation generation Modified: branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java =================================================================== --- branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2009-11-07 17:21:53 UTC (rev 709) +++ branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2009-11-07 17:41:17 UTC (rev 710) @@ -253,7 +253,7 @@ paramDocumentation = ""; } /*{ * @param <%=paramName%> <%=paramDocumentation%> - }*/ +}*/ } String opVisibility = op.getVisibility(); String opStatic = op.isStatic() ? "static " : ""; @@ -266,12 +266,19 @@ if (!opReturn.contains("void")) { String paramDocumentation = returnParam.getDocumentation(); if (paramDocumentation == null) { - paramDocumentation = returnParam.getType(); + paramDocumentation = opReturn; } /*{ * @return <%=paramDocumentation%> - }*/ +}*/ } } + Set<String> exceptions = op.getExceptions(); + for (String exception : exceptions) { + String exceptionName = GeneratorUtil.getSimpleName(exception); +/*{ * @throws <%=exceptionName%> +}*/ + } + /*{ *) <%=opVisibility%> <%=opStatic%><%=opAbstract%><%=opReturn%><%=opName%>(}*/ String comma = ""; @@ -282,10 +289,11 @@ comma = ", "; } /*{)}*/ - Set<String> exceptions = op.getExceptions(); + comma = " throws "; for (String exception : exceptions) { -/*{<%=comma%><%=exception%>}*/ + String exceptionName = GeneratorUtil.getSimpleName(exception); +/*{<%=comma%><%=exceptionName%>}*/ comma = ", "; }