Author: thimel Date: 2009-04-29 15:06:40 +0000 (Wed, 29 Apr 2009) New Revision: 484 Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelOperationImpl.java Log: Documentation reads into tagvalue ReturnType is "void" if not set Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java 2009-04-26 20:40:15 UTC (rev 483) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java 2009-04-29 15:06:40 UTC (rev 484) @@ -129,6 +129,9 @@ * @return the whole documentation associated with this element. */ public String getDocumentation() { + if (documentation == null && hasTagValue("documentation")) { + return getTagValue("documentation"); + } return documentation; } @@ -138,7 +141,7 @@ * @return the description associated with this element. */ public String getDescription() { - return documentation.substring(0, documentation.indexOf("--")); + return getDocumentation().substring(0, getDocumentation().indexOf("--")); } /** @@ -147,7 +150,7 @@ * @return the source documentation part associated with this element. */ public String getSourceDocumentation() { - return documentation.substring(documentation.indexOf("--") + 2); + return getDocumentation().substring(getDocumentation().indexOf("--") + 2); } /** Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelOperationImpl.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelOperationImpl.java 2009-04-26 20:40:15 UTC (rev 483) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelOperationImpl.java 2009-04-29 15:06:40 UTC (rev 484) @@ -109,11 +109,13 @@ returnParameter.postInit(); returnParameter.setDeclaringElement(this); this.returnParameter = returnParameter; - // return returnParameter; } public String getReturnType() { - return returnParameter.getType(); + if (returnParameter != null) { + return returnParameter.getType(); + } + return "void"; } public String getVisibility() {