Author: tchemit Date: 2011-10-20 02:40:41 +0200 (Thu, 20 Oct 2011) New Revision: 1110 Url: http://nuiton.org/repositories/revision/eugene/1110 Log: Evolution #1779: Improve java generation Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2011-10-20 00:23:20 UTC (rev 1109) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2011-10-20 00:40:41 UTC (rev 1110) @@ -402,6 +402,10 @@ attrVisibility = ""; } + if (StringUtils.isNotEmpty(attrVisibility)) { + attrVisibility += " "; + } + String attrValue = StringUtils.isNotEmpty(attr.getDefaultValue()) ? // ANO#474 FD-20100408 : Don't do any simplification for // defaultValue, must be managed when the attribute is added @@ -444,7 +448,9 @@ } generateOperationDocumentation(output, op); - String opVisibility = !interfacez ? op.getVisibility()+" " : ""; + generateAnnotations(output, clazz, op); + + String opVisibility = !interfacez ? op.getVisibility() : ""; String opStatic = op.isStatic() ? "static " : ""; String opAbstract = op.isAbstract() ? "abstract " : ""; @@ -454,8 +460,10 @@ opReturn = GeneratorUtil.getSimpleName( returnParam.getType()) + " "; } + if (StringUtils.isNotEmpty(opVisibility)) { + opVisibility += " "; + } - generateAnnotations(output, clazz, op); /*{<%=prefix%> <%=opVisibility%><%=opStatic%><%=opAbstract%><%=opReturn%><%=opName%>(}*/ String comma = ""; Collection<ObjectModelParameter> params = op.getParameters();
participants (1)
-
tchemit@users.nuiton.org