Update JavaDoc comments generation

veraPDF · Jul 16, 2023 · 198113f · 198113f
1 parent f3f7c83
commit 198113f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 89 deletions.
diff --git a/RELEASE.md b/RELEASE.md
diff --git a/org.verapdf/src/org/verapdf/Model.xtext b/org.verapdf/src/org/verapdf/Model.xtext
@@ -9,7 +9,7 @@ Model:
 ;
 
 Entity:
-	(comment = COMMENT)*
+	(comment += COMMENT)*
 	'type' name = ID ('extends' superType = [Entity | QualifiedName])? '{'
 		(attributes += Attribute)*
 	'}'
@@ -20,12 +20,12 @@ Attribute:
 ;
 
 Property:
-	(comment = COMMENT)*
+	(comment += COMMENT)*
 	'property' name = ID ':' type = ('String' | 'Integer' | 'Decimal' | 'Boolean')';'
 ;
 
 Link:
-	(comment = COMMENT)*
+	(comment += COMMENT)*
 	'link' name = ID ':' type = [Entity | QualifiedName] (any ?= '*' | oneOrMore ?= '+' | zeroOrOne ?= '?')?';'
 ;
 

diff --git a/org.verapdf/src/org/verapdf/generator/ModelGenerator.xtend b/org.verapdf/src/org/verapdf/generator/ModelGenerator.xtend
@@ -124,8 +124,12 @@ class ModelGenerator implements IGenerator {
 		}
     }
 	
-	def toJavaDocComment (String comment) '''
-		/** «comment.substring(1)» */
+	def toJavaDocComment (List<String> comments) '''
+		/**
+		«FOR comment : comments»
+    		*«comment.substring(1)»
+		«ENDFOR»
+		*/
 	'''
 
 	def toInterfaceName (String name) '''I«name»'''