From 6508b91a1b7f4bd7de6e7f4377744f185a4b6e4f Mon Sep 17 00:00:00 2001
From: Hallvard Traetteberg <hal@ntnu.no>
Date: Thu, 10 Oct 2019 16:07:51 +0200
Subject: [PATCH] Small changes

---
 .../no/hal/quiz/html/Quiz2TextGenerator.xtend | 36 ++-----------------
 1 file changed, 3 insertions(+), 33 deletions(-)

diff --git a/no.hal.quiz.html/src/no/hal/quiz/html/Quiz2TextGenerator.xtend b/no.hal.quiz.html/src/no/hal/quiz/html/Quiz2TextGenerator.xtend
index 34b91f8..df2af29 100644
--- a/no.hal.quiz.html/src/no/hal/quiz/html/Quiz2TextGenerator.xtend
+++ b/no.hal.quiz.html/src/no/hal/quiz/html/Quiz2TextGenerator.xtend
@@ -39,44 +39,14 @@ class Quiz2TextGenerator {
 		generateHtml(quiz, new StringBuilder).toString
 	}
 
-	def String generateHtml(Iterable<AbstractQuizPart> quizParts) {
-		val builder = new StringBuilder
-		generatePreHtml("Quiz", builder)
-		for (AbstractQuizPart quizPart : quizParts) {
-			if (quizPart instanceof QuizPartRef) {
-				generate((quizPart as QuizPartRef).partRef, builder)
-			} else if (quizPart instanceof QuizPart) {
-				generate(quizPart as QuizPart, builder)
-			}
-		}
-		generatePostHtml(builder)
-		builder.toString
-	}
-
-	def String generateHtml(QuizPart quizPart) {
-		val builder = new StringBuilder
-		generatePreHtml((quizPart.title ?: quizPart.name), builder)
-		generate(quizPart, builder)
-		generatePostHtml(builder)
-		builder.toString
-	}
-
-	def CharSequence generatePreHtml(String title, StringBuilder stringBuilder) {
+	def CharSequence generateHtml(Quiz quiz, StringBuilder stringBuilder) {
 		stringBuilder << '''
 <html>
 <head>
-	<title>«title»</title>
+	<title>«(quiz.title ?: quiz.name)»</title>
 	<meta charset="utf-8"/>
 </head>
 <body>'''
-	}
-
-	def CharSequence generatePostHtml(StringBuilder stringBuilder) {
-		stringBuilder << "</body></html>\n"
-	}
-
-	def CharSequence generateHtml(Quiz quiz, StringBuilder stringBuilder) {
-		generatePreHtml((quiz.title ?: quiz.name), stringBuilder)
 		quiz.parts.forEach[generate(it, stringBuilder)]
 		stringBuilder << '''
 <script type="text/javascript">
@@ -133,7 +103,7 @@ function validatedInput(result) {
 		stringBuilder << '''
 </script>
 '''
-		generatePostHtml(stringBuilder)
+		stringBuilder << "</body></html>\n"
 	}
 
 	def dispatch void generate(QuizPartRef quizPartRef, StringBuilder stringBuilder) {
-- 
GitLab