From f2f261296921d390ca5d9c99792efbc4c5509178 Mon Sep 17 00:00:00 2001 From: James Date: Sun, 5 May 2019 17:11:16 +0100 Subject: [PATCH] Rename class --- src/main/kotlin/org/idiosapps/BuilderPipeline.kt | 2 +- src/main/kotlin/org/idiosapps/FooterUtils.kt | 2 +- .../idiosapps/{SummaryPageWriter.kt => SummaryPageUtils.kt} | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename src/main/kotlin/org/idiosapps/{SummaryPageWriter.kt => SummaryPageUtils.kt} (89%) diff --git a/src/main/kotlin/org/idiosapps/BuilderPipeline.kt b/src/main/kotlin/org/idiosapps/BuilderPipeline.kt index 0949954..ff413d7 100644 --- a/src/main/kotlin/org/idiosapps/BuilderPipeline.kt +++ b/src/main/kotlin/org/idiosapps/BuilderPipeline.kt @@ -25,7 +25,7 @@ class BuilderPipeline : Task() { TexUtils.copyToTex(texWriter, Filenames.inputTitleFilename) TexUtils.copyToTex(texWriter, Filenames.inputStoryFilename) - SummaryPageWriter.writeVocabSection(texWriter, vocab) // TODO add summary / grammar pages too + SummaryPageUtils.writeVocabSection(texWriter, vocab) // TODO add summary / grammar / names pages too texWriter.append("\\end{document}") } diff --git a/src/main/kotlin/org/idiosapps/FooterUtils.kt b/src/main/kotlin/org/idiosapps/FooterUtils.kt index 642730c..3285f19 100644 --- a/src/main/kotlin/org/idiosapps/FooterUtils.kt +++ b/src/main/kotlin/org/idiosapps/FooterUtils.kt @@ -94,7 +94,7 @@ class FooterUtils { pagesVocab.forEach { vocabItem -> val vocabFooter = "${vocabItem.firstOccurencePage!! - 1}.${vocabItem.vocabOrderIndex!! + 1} " + "${vocabItem.L2Word} ${LanguageUtils.getMarkedL2Extra(vocabItem)} - " + - "${vocabItem.L1Word}${SummaryPageWriter.endLine}" + "${vocabItem.L1Word}${SummaryPageUtils.endLine}" when (doLeftFooter) { true -> { leftFooter.append(vocabFooter); doLeftFooter = !doLeftFooter diff --git a/src/main/kotlin/org/idiosapps/SummaryPageWriter.kt b/src/main/kotlin/org/idiosapps/SummaryPageUtils.kt similarity index 89% rename from src/main/kotlin/org/idiosapps/SummaryPageWriter.kt rename to src/main/kotlin/org/idiosapps/SummaryPageUtils.kt index 5eece22..8b0d83d 100644 --- a/src/main/kotlin/org/idiosapps/SummaryPageWriter.kt +++ b/src/main/kotlin/org/idiosapps/SummaryPageUtils.kt @@ -1,13 +1,13 @@ package org.idiosapps -import org.idiosapps.OSUtils.Companion.SPACE import java.io.PrintWriter -class SummaryPageWriter { +class SummaryPageUtils { // TODO fun writeTeXGrammarSection // TODO fun writeTeXQuestionsSection + // TODO fun writeNamesSection companion object { - val endLine = "\\\\" + const val endLine = "\\\\" fun writeVocabSection( outputStoryWriter: PrintWriter, vocab: MutableList