diff --git a/brailleblaster-core/pom.xml b/brailleblaster-core/pom.xml index d8798ac6..57c043af 100644 --- a/brailleblaster-core/pom.xml +++ b/brailleblaster-core/pom.xml @@ -419,7 +419,6 @@ org.apache.maven.plugins maven-surefire-plugin - ${mavensurefireplugin.version} true diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/archiver2/ArchiverRecoverThread.kt b/brailleblaster-core/src/main/java/org/brailleblaster/archiver2/ArchiverRecoverThread.kt index 573525c3..ba407344 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/archiver2/ArchiverRecoverThread.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/archiver2/ArchiverRecoverThread.kt @@ -138,11 +138,9 @@ class ArchiverRecoverThread(private val m: Manager) { return "${path.nameWithoutExtension} $dateTimeString.${path.extension}" } - @JvmStatic val recentSaves: List get() = RECENT_SAVE_FILES - @JvmStatic fun readRecentSaves(): MutableList { try { return Files.readAllLines(BBIni.recentSaves, BBIni.charset) diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/archiver2/NimasZipArchiverLoader.kt b/brailleblaster-core/src/main/java/org/brailleblaster/archiver2/NimasZipArchiverLoader.kt index 8b3343ab..a57d2112 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/archiver2/NimasZipArchiverLoader.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/archiver2/NimasZipArchiverLoader.kt @@ -46,7 +46,7 @@ class NimasZipArchiverLoader : ArchiverFactory.FileLoader { var bookPath: Path? = null val opfFiles = findOPFFilesInFolder(zipRoot) - if (!opfFiles.isEmpty()) { + if (opfFiles.isNotEmpty()) { if (opfFiles.size > 1) { log.warn("Detected multiple OPF files, picking first: {}", opfFiles) } diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/archiver2/OPFUtils.kt b/brailleblaster-core/src/main/java/org/brailleblaster/archiver2/OPFUtils.kt index 1330031e..27b1a801 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/archiver2/OPFUtils.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/archiver2/OPFUtils.kt @@ -32,8 +32,7 @@ import java.util.stream.Collectors object OPFUtils { private val log: Logger = LoggerFactory.getLogger(OPFUtils::class.java) - @JvmStatic - fun findOPFFilesInFolder(folder: Path): List { + fun findOPFFilesInFolder(folder: Path): List { try { val opfs = Files.walk(folder) .filter { obj: Path -> pathNotHiddenOrInHiddenDirectory(obj) && obj.toString().endsWith(".opf") } @@ -50,11 +49,15 @@ object OPFUtils { } } - @JvmStatic - fun getDCElementValueCaseInsensitive(opfDocument: Document?, opfElemName: String?): String? { + fun getDCElementValueCaseInsensitive(opfDocument: Document?, opfElemName: String?): String? { val results = FastXPath.descendant(opfDocument) .filterIsInstance() - .filter { curElem: Element -> curElem.namespacePrefix == "dc" && curElem.localName.equals(opfElemName, ignoreCase = true) }.toList() + .filter { curElem: Element -> + curElem.namespacePrefix == "dc" && curElem.localName.equals( + opfElemName, + ignoreCase = true + ) + }.toList() if (results.isEmpty()) { return null } else if (results.size > 1) { @@ -63,8 +66,7 @@ object OPFUtils { return results[0].value } - @JvmStatic - fun getManifestItems(opfDocument: Document): List { + fun getManifestItems(opfDocument: Document): List { val namespace = opfDocument.rootElement.namespaceURI val manifestRoot = opfDocument.rootElement.getFirstChildElement( "manifest", @@ -90,8 +92,7 @@ object OPFUtils { * @param path * @return */ - @JvmStatic - fun pathNotHiddenOrInHiddenDirectory(path: Path): Boolean { + fun pathNotHiddenOrInHiddenDirectory(path: Path): Boolean { if (path.fileName == null) { return false } diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/archiver2/TextArchiveLoader.kt b/brailleblaster-core/src/main/java/org/brailleblaster/archiver2/TextArchiveLoader.kt index ae41ec6c..e73056f0 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/archiver2/TextArchiveLoader.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/archiver2/TextArchiveLoader.kt @@ -32,14 +32,16 @@ open class TextArchiveLoader : ArchiverFactory.FileLoader { val bbxDoc = BBX.newDocument() val root = BBX.SECTION.ROOT.create() bbxDoc.rootElement.appendChild(root) - file.readLines(BBIni.charset).flatMap { it.split('\u000c') }.filter { it.isNotBlank() }.mapNotNull { getUsableText(it) }.fold(root) { r, v -> + file.readLines(BBIni.charset).flatMap { it.split('\u000c') }.filter { it.isNotBlank() } + .mapNotNull { getUsableText(it) }.fold(root) { r, v -> r.also { it.appendChild(createBlock(v)) } } val archiver: Archiver2 = BBZArchiver.createImportedBBZ(file, bbxDoc) var fileStr = file.toString() - fileStr = (if (fileStr.lowercase(Locale.getDefault()).endsWith(".txt")) fileStr.dropLast(4) else fileStr) + ".bbz" + fileStr = + (if (fileStr.lowercase(Locale.getDefault()).endsWith(".txt")) fileStr.dropLast(4) else fileStr) + ".bbz" archiver.newPath = Paths.get(fileStr) return archiver } @@ -67,8 +69,7 @@ open class TextArchiveLoader : ArchiverFactory.FileLoader { * @param line * @return */ - @JvmStatic - fun getUsableText(line: String): Text? { + fun getUsableText(line: String): Text? { return try { Text(line) } catch (_: IllegalCharacterDataException) { diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/bbx/BBX.java b/brailleblaster-core/src/main/java/org/brailleblaster/bbx/BBX.java index 681c3dca..ed078fe2 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/bbx/BBX.java +++ b/brailleblaster-core/src/main/java/org/brailleblaster/bbx/BBX.java @@ -1805,7 +1805,7 @@ protected String marshall(ArrayList input) { int numChars = string.length(); String sizeString = String.valueOf(numChars); int digitLength = sizeString.length(); - Matrix.matrixLog("StringBuilder digits {} length {} and string {}" + digitLength + sizeString + string); + Matrix.Companion.matrixLog("StringBuilder digits {} length {} and string {}" + digitLength + sizeString + string); s.append(digitLength).append(sizeString).append(string); } return s.toString(); diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/bbx/BBXUtils.kt b/brailleblaster-core/src/main/java/org/brailleblaster/bbx/BBXUtils.kt index 033b2051..d34798f0 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/bbx/BBXUtils.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/bbx/BBXUtils.kt @@ -93,13 +93,10 @@ fun Node.getAncestorListLevel(): Int = BBX.CONTAINER.LIST.ATTRIB_LIST_LEVEL[XMLH object BBXUtils { private val log: Logger = LoggerFactory.getLogger(BBXUtils::class.java) - @JvmStatic fun isPageNumAncestor(node: Node): Boolean = node.isPageNumAncestor() - @JvmStatic fun findBlockChild(node: Element): Element = node.findBlockChild() - @JvmStatic fun findBlock(node: Node): Element = node.findBlock() /** @@ -280,7 +277,6 @@ object BBXUtils { * only images to image containers. Node is any child of * the block, or the block itself. Returns the parent of the removed element */ - @JvmStatic fun cleanupBlock(node: Node): Node? { val block = node.findBlockOrNull() ?: return null block.stripUTDRecursive() @@ -376,8 +372,7 @@ object BBXUtils { transElement.appendChild(textToWrap) return transElement } - - @JvmStatic + fun wrapAsTransNote(element: Element): Element { val newEl = wrapAsTransNote(element.value) element.removeChildren() diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/bbx/BookToBBXConverter.kt b/brailleblaster-core/src/main/java/org/brailleblaster/bbx/BookToBBXConverter.kt index e32bced9..d10ce97a 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/bbx/BookToBBXConverter.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/bbx/BookToBBXConverter.kt @@ -241,8 +241,6 @@ class BookToBBXConverter( DEBUG_ASK_SWT_DIALOG = !unitTest.isNullOrBlank() && unitTest.startsWith("org.brailleblaster") } - @JvmStatic - @JvmOverloads fun fromConfig(bookType: String = "nimas"): BookToBBXConverter { if (BBDocument.TEST_MODE && TEST_CONFIG == bookType) { return TEST_CONVERTER @@ -259,7 +257,6 @@ class BookToBBXConverter( return converter } - @JvmStatic fun upgradeFormat(doc: Document) { val formatVersion = BBX.getFormatVersion(doc) if (formatVersion >= BBX.FORMAT_VERSION) { @@ -351,7 +348,6 @@ class BookToBBXConverter( } } - @JvmStatic fun devSetup(args: Array): Array { return if (File("/home/leon/").exists()) { System.setProperty(NodeException.SAVE_TO_DISK_FOLDER_PROPERTY, "exception.xml") diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/bbx/fixers/NodeTreeSplitter.kt b/brailleblaster-core/src/main/java/org/brailleblaster/bbx/fixers/NodeTreeSplitter.kt index be8a3163..82bf722b 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/bbx/fixers/NodeTreeSplitter.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/bbx/fixers/NodeTreeSplitter.kt @@ -48,17 +48,17 @@ object NodeTreeSplitter { * @param splitAt The root of what gets duplicated in the split element * @return The after root or null if empty */ - @JvmStatic - fun split(root: Element?, splitAt: Node?): Element? { + fun split(root: Element?, splitAt: Node?): Element? { if (root == null) { throw NullPointerException("oldRootElement") } else if (splitAt == null) { throw NullPointerException("oldTrigger") } else if (root === splitAt) { log.error("root " + XMLHandler.toXMLSimple(root)) - log.error("splitAt " + XMLHandler.toXMLSimple( - splitAt - ) + log.error( + "splitAt " + XMLHandler.toXMLSimple( + splitAt + ) ) throw NodeException("root == splitAt, splitAt: ", splitAt) } else if (FastXPath.descendant(root).none { node: Node -> node === splitAt }) { diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/bbx/fixers/TableImportFixer.kt b/brailleblaster-core/src/main/java/org/brailleblaster/bbx/fixers/TableImportFixer.kt index 7f7acb5e..ef3a4aaa 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/bbx/fixers/TableImportFixer.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/bbx/fixers/TableImportFixer.kt @@ -95,7 +95,6 @@ class TableImportFixer : AbstractFixer() { * Detect table type when given table has no braille, without changing the * source document with table copies */ - @JvmStatic fun detectTableTypeUntranslated(table: Element): TableTypes { BBX.CONTAINER.TABLE.assertIsA(table) val utdMan = ImportFixerCommon.UTD_MANAGER @@ -196,7 +195,6 @@ class TableImportFixer : AbstractFixer() { * @param bbxTable * @return List of elements (blocks and maybe containers) that were under the table cell */ - @JvmStatic fun stripTable(bbxTable: Element): List { BBX.CONTAINER.TABLE.assertIsA(bbxTable) val cells: MutableList = ArrayList() diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/bbx/fixers/to3/ImageBlockToContainerImportFixer.kt b/brailleblaster-core/src/main/java/org/brailleblaster/bbx/fixers/to3/ImageBlockToContainerImportFixer.kt index 2f2aa390..45c5528b 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/bbx/fixers/to3/ImageBlockToContainerImportFixer.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/bbx/fixers/to3/ImageBlockToContainerImportFixer.kt @@ -30,15 +30,14 @@ class ImageBlockToContainerImportFixer : AbstractFixer() { } companion object { - @JvmStatic - fun convertImageBlockToContainer(imgElem: Element) { + fun convertImageBlockToContainer(imgElem: Element) { if (!BBX.SPAN.IMAGE.isA(imgElem) && !BBX.CONTAINER.IMAGE.isA(imgElem)) { throw NodeException("Not an image", imgElem) } val parentBlock = requireNotNull( XMLHandler.ancestorVisitorElement(imgElem) { node -> BBX.BLOCK.isA(node) }) { "Cannot find a parent block" - } + } if (BBX.SPAN.IMAGE.isA(imgElem) && imgElem.childCount != 0) { val wrappingBlock = BBX.BLOCK.DEFAULT.create() val children = imgElem.childNodes.toList() diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/bbx/fixers2/BBXTo4Upgrader.kt b/brailleblaster-core/src/main/java/org/brailleblaster/bbx/fixers2/BBXTo4Upgrader.kt index d4e02419..d3c6314c 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/bbx/fixers2/BBXTo4Upgrader.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/bbx/fixers2/BBXTo4Upgrader.kt @@ -26,7 +26,6 @@ import org.brailleblaster.utd.internal.xml.FastXPath import org.brailleblaster.utd.internal.xml.XMLHandler object BBXTo4Upgrader { - @JvmStatic fun upgrade(doc: Document) { if (BBX.getFormatVersion(doc) != 4) { fixStyleExtend(doc) diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/bbx/fixers2/BBXTo5Upgrader.kt b/brailleblaster-core/src/main/java/org/brailleblaster/bbx/fixers2/BBXTo5Upgrader.kt index 8fb350de..5d9808f6 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/bbx/fixers2/BBXTo5Upgrader.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/bbx/fixers2/BBXTo5Upgrader.kt @@ -26,8 +26,7 @@ import org.brailleblaster.utd.internal.xml.FastXPath import org.brailleblaster.utd.utils.TableUtils object BBXTo5Upgrader { - @JvmStatic - fun upgrade(doc: Document) { + fun upgrade(doc: Document) { tableCleanup(doc) BBX.setFormatVersion(doc, 5) } diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/bbx/fixers2/BBXTo6Upgrader.kt b/brailleblaster-core/src/main/java/org/brailleblaster/bbx/fixers2/BBXTo6Upgrader.kt index 0288d0ad..d1428bb9 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/bbx/fixers2/BBXTo6Upgrader.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/bbx/fixers2/BBXTo6Upgrader.kt @@ -21,7 +21,6 @@ import org.brailleblaster.bbx.BBX import org.brailleblaster.utd.internal.xml.FastXPath object BBXTo6Upgrader { - @JvmStatic fun upgrade(doc: Document) { tabCleanup(doc) BBX.setFormatVersion(doc, 6) diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/embossers/EmbosserOptionsView.kt b/brailleblaster-core/src/main/java/org/brailleblaster/embossers/EmbosserOptionsView.kt index 9472eb8a..6ac32271 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/embossers/EmbosserOptionsView.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/embossers/EmbosserOptionsView.kt @@ -58,19 +58,20 @@ class EmbosserOptionsView(parent: Composite, style: Int = SWT.BORDER or SWT.H_SC fun removeValidateListener(listener: ValidateListener) { validateListeners -= listener } - private val scrolledComposite = ScrolledComposite(parent, style).apply { - expandHorizontal = true - expandVertical = true - showFocusedControl = true - } + val control: Control - get() = scrolledComposite + field = ScrolledComposite(parent, style).apply { + expandHorizontal = true + expandVertical = true + showFocusedControl = true + } + private fun updateOptionsView(options: Map) { - scrolledComposite.content?.dispose() + control.content?.dispose() val newContent = if (options.isEmpty()) { - EasySWT.makeLabel(scrolledComposite).text(LocaleHandler.getDefault()["EmbosserEditDialog.optionsView.noOptions"]).get() + EasySWT.makeLabel(control).text(LocaleHandler.getDefault()["EmbosserEditDialog.optionsView.noOptions"]).get() } else { - val optionsContainer = Composite(scrolledComposite, SWT.NONE) + val optionsContainer = Composite(control, SWT.NONE) optionsContainer.layout = GridLayout(2, false) for ((k, v) in options) { EasySWT.makeLabel(optionsContainer).text(k.getDisplayName(Locale.getDefault())) @@ -100,8 +101,8 @@ class EmbosserOptionsView(parent: Composite, style: Int = SWT.BORDER or SWT.H_SC } optionsContainer } - scrolledComposite.content = newContent - scrolledComposite.setMinSize(newContent.computeSize(SWT.DEFAULT, SWT.DEFAULT)) + control.content = newContent + control.setMinSize(newContent.computeSize(SWT.DEFAULT, SWT.DEFAULT)) } init { embosserOptions = options diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/frontmatter/TOCBuilderBBX.kt b/brailleblaster-core/src/main/java/org/brailleblaster/frontmatter/TOCBuilderBBX.kt index 39b3220f..22da5b29 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/frontmatter/TOCBuilderBBX.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/frontmatter/TOCBuilderBBX.kt @@ -826,7 +826,7 @@ class TOCBuilderBBX(private var manager: Manager) : CheckMenuTool, MenuToolModul // Only give last word pageStart = indexOfPage(lastTextNode.value) - if (pageStart != -1 && !lastTextNode.value.substring(0, pageStart).isBlank()) { + if (pageStart != -1 && lastTextNode.value.substring(0, pageStart).isNotBlank()) { // found text before page in next entry log.debug("ignoring as most likely found another toc entry") return @@ -1249,7 +1249,6 @@ class TOCBuilderBBX(private var manager: Manager) : CheckMenuTool, MenuToolModul /** * Ancestor Block that can be unwrapped and moved */ - @JvmStatic fun isPageMovable(input: Node): Element? { if (input.document == null) { throw NodeException("Node not attached to document", input) @@ -1299,20 +1298,13 @@ class TOCBuilderBBX(private var manager: Manager) : CheckMenuTool, MenuToolModul TOCAttributes.TYPE.add(elem, type) } - @JvmStatic - fun isEnabled(m: Manager): Boolean { - return m.simpleManager.getModule( - TOCBuilderBBX::class.java - )!!.enabled - } + fun isEnabled(m: Manager): Boolean = m.simpleManager.getModule( + TOCBuilderBBX::class.java + )!!.enabled - private fun isTocTitle(curNode: Node): Boolean { - return isTocElement(curNode, "title") - } + private fun isTocTitle(curNode: Node): Boolean = isTocElement(curNode, "title") - private fun isTocPage(curNode: Node): Boolean { - return isTocElement(curNode, "page") - } + private fun isTocPage(curNode: Node): Boolean = isTocElement(curNode, "page") private fun isTocElement(curNode: Node, key: String): Boolean { if (curNode !is Element) { diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/frontmatter/TPagesDialog.kt b/brailleblaster-core/src/main/java/org/brailleblaster/frontmatter/TPagesDialog.kt index ea654547..efb2d424 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/frontmatter/TPagesDialog.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/frontmatter/TPagesDialog.kt @@ -1015,10 +1015,10 @@ class TPagesDialog : DebugMenuToolModule { //Dumb SWT manipulation val values = items.map { it.getText(0) to it.getText(1) } symbolsTable.removeAll() - for (i in values) { + for ((first, second) in values) { val newItem = TableItem(symbolsTable, SWT.NONE) - newItem.setText(0, i.first) - newItem.setText(1, i.second) + newItem.setText(0, first) + newItem.setText(1, second) } } diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/frontmatter/VolumeSaveDialog.kt b/brailleblaster-core/src/main/java/org/brailleblaster/frontmatter/VolumeSaveDialog.kt index da080e1c..87e14d22 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/frontmatter/VolumeSaveDialog.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/frontmatter/VolumeSaveDialog.kt @@ -536,7 +536,7 @@ class VolumeSaveDialog( } val finalBrf = finalBrfMut!! - check(!finalBrf.isBlank()) { "No finalBrf?! $LINE_BREAK$finalBrf$LINE_BREAK=------=" } + check(finalBrf.isNotBlank()) { "No finalBrf?! $LINE_BREAK$finalBrf$LINE_BREAK=------=" } //Remove lingering empty page from resetting the page to restart the BRF output val linesPerPage = engine.brailleSettings.cellType.getLinesForHeight( diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/math/ascii/ASCII2MathML.kt b/brailleblaster-core/src/main/java/org/brailleblaster/math/ascii/ASCII2MathML.kt index 1a4fcc56..a14b48b7 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/math/ascii/ASCII2MathML.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/math/ascii/ASCII2MathML.kt @@ -30,7 +30,7 @@ object ASCII2MathML { * @param st * @return math root node, detached from document,, or null */ - @JvmStatic + fun translate(st: String): Node { var s = st if (s.contains("\r")) { @@ -64,7 +64,7 @@ object ASCII2MathML { * @param st * @return math root node, detached from document,, or null */ - @JvmStatic + fun translateUseHTML(st: String): org.w3c.dom.Element { var s = st if (s.contains("\r")) { diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/math/mathml/MathModuleUtils.kt b/brailleblaster-core/src/main/java/org/brailleblaster/math/mathml/MathModuleUtils.kt index ee2ee1e7..db575e02 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/math/mathml/MathModuleUtils.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/math/mathml/MathModuleUtils.kt @@ -147,7 +147,6 @@ object MathModuleUtils { } } - @JvmStatic fun isMath(currentNode: Node?): Boolean { return (currentNode is Element && currentNode.localName == "math") || (currentNode != null && XMLHandler.ancestorElementIs( @@ -159,7 +158,6 @@ object MathModuleUtils { return currentNode is Element && currentNode.localName == "math" } - @JvmStatic fun getMathText(node: Node?): String { val string = if (node is Element) node.getAttributeValue("alttext") else "" return string ?: "" @@ -176,7 +174,6 @@ object MathModuleUtils { return n } - @JvmStatic fun blockContainsMath(curBlock: Node): Boolean { if (curBlock.childCount > 0) { for (i in 0 until curBlock.childCount) { @@ -190,7 +187,6 @@ object MathModuleUtils { } } - @JvmStatic fun selectionContainsMath(m: Manager): Boolean { val tmes = m.mapList.getElementsOneByOne( m.textView.selection.x, @@ -222,7 +218,6 @@ object MathModuleUtils { node.addAttribute(att) } - @JvmStatic fun makeMathFromSelection(m: Manager): Node? { val selectedText = m.textView.selectionText if (selectedText.isEmpty()) { @@ -234,12 +229,10 @@ object MathModuleUtils { return inline } - @JvmStatic val isNemeth: Boolean get() = MathBraileCode.Nemeth == getInstance().controller.document .engine.brailleSettings.mathBrailleCode - - @JvmOverloads + fun getBrailleText(node: Node, s: String = ""): String { var sb = StringBuilder(s) for (i in 0 until node.childCount) { @@ -302,7 +295,6 @@ object MathModuleUtils { ) } - @JvmStatic fun isSpatialMath(node: Node?): Boolean { return node != null && (XMLHandler.ancestorVisitorElement( node @@ -322,7 +314,6 @@ object MathModuleUtils { ?: throw NoSuchElementException() } - @JvmStatic fun retranslateSpatial(document: BrailleDocument) { val nodes = XMLHandler.queryElements( document.doc, diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/math/mathml/MathUtils.kt b/brailleblaster-core/src/main/java/org/brailleblaster/math/mathml/MathUtils.kt index 8aefd383..96ccf4b3 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/math/mathml/MathUtils.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/math/mathml/MathUtils.kt @@ -113,7 +113,6 @@ object MathUtils { return mapElements.map { it.node.findBlock() }.distinct() } - @JvmStatic fun removeMathInSelectedRange(m: Manager) { val timmies = getAllTextMapElementsInSelectedRange(m) val blocks = ArrayList() @@ -160,7 +159,6 @@ object MathUtils { } } - @JvmStatic fun deleteMathFromSelectionHandlerEvent(m: Manager, mapElement: MathMLElement, start: Int, end: Int) { var end = end val block: ParentNode = mapElement.node.findBlock() diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/math/mathml/NemethIndicators.kt b/brailleblaster-core/src/main/java/org/brailleblaster/math/mathml/NemethIndicators.kt index cac641d2..95cbcff8 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/math/mathml/NemethIndicators.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/math/mathml/NemethIndicators.kt @@ -30,8 +30,7 @@ object NemethIndicators { const val INLINE_BEGINNING_INDICATOR = BEGINNING_INDICATOR + MathModuleUtils.NBS const val INLINE_END_INDICATOR = MathModuleUtils.NBS + END_INDICATOR private val log = LoggerFactory.getLogger(NemethIndicators::class.java) - @JvmStatic - fun block(m: Manager) { + fun block(m: Manager) { log.error("Nemeth blocking ") if (m.simpleManager.currentSelection.isTextNoSelection) { return @@ -48,8 +47,7 @@ object NemethIndicators { } } - @JvmStatic - fun inline(m: Manager) { + fun inline(m: Manager) { log.error("Nemeth inlining ") if (m.simpleManager.currentSelection.isTextNoSelection) { return diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/math/mathml/NumericPassage.kt b/brailleblaster-core/src/main/java/org/brailleblaster/math/mathml/NumericPassage.kt index ccae424b..36f8cd9c 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/math/mathml/NumericPassage.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/math/mathml/NumericPassage.kt @@ -34,8 +34,7 @@ object NumericPassage { val NUMERIC_PASSAGE_BLOCK = localeHandler["blockNumericPassage"] val NUMERIC_PASSAGE_INLINE = localeHandler["inlineNumericPassage"] private val log = LoggerFactory.getLogger(NumericPassage::class.java) - @JvmStatic - fun block(m: Manager) { + fun block(m: Manager) { log.debug("Block Numeric Passage ") val array = BlockSelectionInTextSymbols.block( m, BLOCK_BEGINNING_INDICATOR, BLOCK_END_INDICATOR, @@ -47,8 +46,7 @@ object NumericPassage { m.simpleManager.dispatchEvent(ModifyEvent(Sender.MATH, array, true)) } - @JvmStatic - fun inline(m: Manager) { + fun inline(m: Manager) { log.debug("Inline Numeric Passage ") if (m.simpleManager.currentSelection.isTextNoSelection) { return diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/math/mathml/NumericSeries.kt b/brailleblaster-core/src/main/java/org/brailleblaster/math/mathml/NumericSeries.kt index 2e91c68e..a76ef2d7 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/math/mathml/NumericSeries.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/math/mathml/NumericSeries.kt @@ -33,8 +33,7 @@ import org.brailleblaster.util.Notify.notify object NumericSeries { const val BRAILLE_DOT_5 = "\u2810" - @JvmStatic - fun toggleNumeric(m: Manager) { + fun toggleNumeric(m: Manager) { val selectedText = m.textView.selectionText if (selectedText.isEmpty()) { return diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/math/numberLine/NumberLine.kt b/brailleblaster-core/src/main/java/org/brailleblaster/math/numberLine/NumberLine.kt index 851e4314..2c030889 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/math/numberLine/NumberLine.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/math/numberLine/NumberLine.kt @@ -174,14 +174,14 @@ class NumberLine : ISpatialMathContainer { fun rebuildPoints(points: Int) { if (numberLineText.points.size < points) { val difference = points - numberLineText.points.size - for (j in 0 until difference) { + repeat(difference) { numberLineText .points .add(NumberLineSegmentPoint()) } } else if (numberLineText.points.size > points) { val difference = numberLineText.points.size - points - for (j in 0 until difference) { + repeat(difference) { numberLineText.points.removeAt(numberLineText.points.size - 1) } } @@ -189,7 +189,7 @@ class NumberLine : ISpatialMathContainer { fun initializePoints() { if (numberLineText.points.isEmpty()) { - for (j in 0 until DEFAULT_NUM_POINTS) { + repeat(DEFAULT_NUM_POINTS) { numberLineText .points .add(NumberLineSegmentPoint()) @@ -512,7 +512,6 @@ class NumberLine : ISpatialMathContainer { private const val USER_SETTINGS_LEADING_ZEROS = "nle.leadingZeros" val log: Logger = LoggerFactory.getLogger(NumberLine::class.java) - @JvmStatic fun getContainerFromElement(node: Node): NumberLine { var numberLine = NumberLine() var ele = node as Element @@ -538,12 +537,8 @@ class NumberLine : ISpatialMathContainer { } @JvmStatic - fun isNumberLine(node: Node?): Boolean { - if (node == null || node.document == null) { - return false - } - return XMLHandler.ancestorElementIs(node) { e: Element -> BBX.CONTAINER.NUMBER_LINE.isA(e) } - } + fun isNumberLine(node: Node?): Boolean = + node?.document != null && XMLHandler.ancestorElementIs(node) { e: Element -> BBX.CONTAINER.NUMBER_LINE.isA(e) } @JvmStatic fun getNumberLineParent(node: Node): Element? { diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/math/numberLine/NumberLineSegmentPoint.kt b/brailleblaster-core/src/main/java/org/brailleblaster/math/numberLine/NumberLineSegmentPoint.kt index fa65da21..07a9a7fe 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/math/numberLine/NumberLineSegmentPoint.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/math/numberLine/NumberLineSegmentPoint.kt @@ -22,105 +22,105 @@ import org.brailleblaster.math.spatial.SpatialMathEnum.IntervalType import org.slf4j.LoggerFactory class NumberLineSegmentPoint( - var circle: Fill = Fill.FULL, - var point: NumberLineComponent = NumberLineComponent(), - var interval: Int = 1 + var circle: Fill = Fill.FULL, + var point: NumberLineComponent = NumberLineComponent(), + var interval: Int = 1 ) : - Comparable { + Comparable { - override fun compareTo(other: NumberLineSegmentPoint): Int { - return if (interval < other.interval) { - -1 - } else if (interval == other.interval) { - 0 - } else { - 1 - } - } - - companion object { - private val log = LoggerFactory.getLogger(NumberLineSegmentPoint::class.java) - @JvmStatic - fun hasPoint(numberLine: NumberLine, interval: Int): Boolean { - for (i in numberLine.segmentPoints.indices) { - if (numberLine.segmentPoints[i].interval == interval) { - return true + override fun compareTo(other: NumberLineSegmentPoint): Int { + return if (interval < other.interval) { + -1 + } else if (interval == other.interval) { + 0 + } else { + 1 } - } - return false } - @JvmStatic - @Throws(MathFormattingException::class) - fun getPotentialPoints(numberLine: NumberLine): ArrayList { - val array = ArrayList() - if (numberLine.mathFormattingChecks(true)) { - val interval = numberLine.numberLineText.interval.fraction - val lineStart = numberLine.numberLineText.lineStart.fraction - val lineEnd = numberLine.numberLineText.lineEnd.fraction - val totalUnits = lineEnd.subtract(lineStart).divideBy(interval).toDouble().toInt() + 1 - for (i in 0 until totalUnits) { - val fraction: Fraction = if (i != 0) { - val additionalUnits = interval.multiplyBy(Fraction.getFraction(i.toDouble())) - lineStart.add(additionalUnits) - } else { - lineStart - } - val component: NumberLineComponent = when (numberLine.settings.intervalType) { - IntervalType.DECIMAL -> { - val doubleValue = fraction.toDouble().toString() - val parts = doubleValue.split("\\.".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray() - NumberLineComponent(whole=parts[0], - decimal=parts[1]) + companion object { + private val log = LoggerFactory.getLogger(NumberLineSegmentPoint::class.java) + fun hasPoint(numberLine: NumberLine, interval: Int): Boolean { + for (i in numberLine.segmentPoints.indices) { + if (numberLine.segmentPoints[i].interval == interval) { + return true + } } + return false + } - IntervalType.IMPROPER -> NumberLineComponent( - numerator=fraction.numerator.toString(), - denominator=fraction.denominator.toString()) + @Throws(MathFormattingException::class) + fun getPotentialPoints(numberLine: NumberLine): ArrayList { + val array = ArrayList() + if (numberLine.mathFormattingChecks(true)) { + val interval = numberLine.numberLineText.interval.fraction + val lineStart = numberLine.numberLineText.lineStart.fraction + val lineEnd = numberLine.numberLineText.lineEnd.fraction + val totalUnits = lineEnd.subtract(lineStart).divideBy(interval).toDouble().toInt() + 1 + for (i in 0 until totalUnits) { + val fraction: Fraction = if (i != 0) { + val additionalUnits = interval.multiplyBy(Fraction.getFraction(i.toDouble())) + lineStart.add(additionalUnits) + } else { + lineStart + } + val component: NumberLineComponent = when (numberLine.settings.intervalType) { + IntervalType.DECIMAL -> { + val doubleValue = fraction.toDouble().toString() + val parts = doubleValue.split("\\.".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray() + NumberLineComponent( + whole = parts[0], + decimal = parts[1] + ) + } - IntervalType.MIXED -> NumberLineComponent( - whole=fraction.properWhole.toString(), - numerator=fraction.properNumerator.toString(), - denominator=fraction.denominator.toString()) + IntervalType.IMPROPER -> NumberLineComponent( + numerator = fraction.numerator.toString(), + denominator = fraction.denominator.toString() + ) - IntervalType.WHOLE -> NumberLineComponent( - whole=fraction.toInt().toString()) + IntervalType.MIXED -> NumberLineComponent( + whole = fraction.properWhole.toString(), + numerator = fraction.properNumerator.toString(), + denominator = fraction.denominator.toString() + ) - } - array.add( - NumberLineSegmentPoint(point=component, interval=i + 1) - ) - } - } else { - log.error("Get points called but math formatting checks failed") - } - return array - } + IntervalType.WHOLE -> NumberLineComponent( + whole = fraction.toInt().toString() + ) - @JvmStatic - @Throws(MathFormattingException::class) - fun getPotentialPointsStringArray(numberLine: NumberLine): Array { - return getPotentialPoints(numberLine).map { - val fraction = it.point.fraction - NumberLineMathUtils.getFractionString(numberLine, fraction) - }.toTypedArray() - } + } + array.add( + NumberLineSegmentPoint(point = component, interval = i + 1) + ) + } + } else { + log.error("Get points called but math formatting checks failed") + } + return array + } - @JvmStatic - fun getPointFromIndex(numberLine: NumberLine, interval: Int): NumberLineSegmentPoint? { - for (i in numberLine.segmentPoints.indices) { - if (numberLine.segmentPoints[i].interval == interval) { - return numberLine.segmentPoints[i] + @Throws(MathFormattingException::class) + fun getPotentialPointsStringArray(numberLine: NumberLine): Array { + return getPotentialPoints(numberLine).map { + val fraction = it.point.fraction + NumberLineMathUtils.getFractionString(numberLine, fraction) + }.toTypedArray() } - } - return null - } - @JvmStatic - @Throws(MathFormattingException::class) - fun getPrettyString(numberLine: NumberLine, component: NumberLineComponent): String { - val fraction = component.fraction - return NumberLineMathUtils.getFractionString(numberLine, fraction) + fun getPointFromIndex(numberLine: NumberLine, interval: Int): NumberLineSegmentPoint? { + for (i in numberLine.segmentPoints.indices) { + if (numberLine.segmentPoints[i].interval == interval) { + return numberLine.segmentPoints[i] + } + } + return null + } + + @Throws(MathFormattingException::class) + fun getPrettyString(numberLine: NumberLine, component: NumberLineComponent): String { + val fraction = component.fraction + return NumberLineMathUtils.getFractionString(numberLine, fraction) + } } - } } \ No newline at end of file diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/math/spatial/ConnectingContainer.kt b/brailleblaster-core/src/main/java/org/brailleblaster/math/spatial/ConnectingContainer.kt index 61ba58d5..9b07da05 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/math/spatial/ConnectingContainer.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/math/spatial/ConnectingContainer.kt @@ -190,8 +190,7 @@ class ConnectingContainer : ISpatialMathContainer { return container } - @JvmStatic - fun initialize(n: Node): Element { + fun initialize(n: Node): Element { val e = n as Element val t = getContainerFromElement(e) t.format() diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/math/spatial/Grid.kt b/brailleblaster-core/src/main/java/org/brailleblaster/math/spatial/Grid.kt index d25c83b9..96e28891 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/math/spatial/Grid.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/math/spatial/Grid.kt @@ -354,7 +354,6 @@ class Grid : ISpatialMathContainer { } } - @JvmStatic fun initialize(n: Node): Element { val ele = n as Element val page = getPageFromElement(ele) diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/math/spatial/Matrix.kt b/brailleblaster-core/src/main/java/org/brailleblaster/math/spatial/Matrix.kt index 59f0559e..9456e3f9 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/math/spatial/Matrix.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/math/spatial/Matrix.kt @@ -371,7 +371,6 @@ class Matrix : ISpatialMathContainer { private val log: Logger = LoggerFactory.getLogger(Matrix::class.java) - @JvmStatic fun matrixLog(s: String?) { if (DebugModule.enabled) { log.error(s) @@ -410,11 +409,8 @@ class Matrix : ISpatialMathContainer { return true } - private fun calculateWhitespace(length: Int, longestSegmentInColumn: Int): Int { - return (longestSegmentInColumn + 1) - length - } + private fun calculateWhitespace(length: Int, longestSegmentInColumn: Int): Int = (longestSegmentInColumn + 1) - length - @JvmStatic fun middleMatrix(currentElement: TextMapElement): Boolean { if (currentElement.node == null || currentElement is LineBreakElement) { return false @@ -424,18 +420,11 @@ class Matrix : ISpatialMathContainer { return matrix != null } - fun getMatrixParent(node: Node): Element? { - return XMLHandler.ancestorVisitorElement(node) { e: Element -> BBX.CONTAINER.MATRIX.isA(e) } - } + fun getMatrixParent(node: Node): Element? = XMLHandler.ancestorVisitorElement(node) { e: Element -> BBX.CONTAINER.MATRIX.isA(e) } - fun isMatrix(node: Node?): Boolean { - if (node == null || node.document == null) { - return false - } - return XMLHandler.ancestorElementIs(node) { e: Element -> BBX.CONTAINER.MATRIX.isA(e) } - } + fun isMatrix(node: Node?): Boolean = + node?.document != null && XMLHandler.ancestorElementIs(node) { e: Element -> BBX.CONTAINER.MATRIX.isA(e) } - @JvmStatic fun currentIsMatrix(): Boolean { val current: Node? = XMLHandler.ancestorVisitorElement( WPManager.getInstance().controller.simpleManager.currentCaret.node @@ -458,7 +447,6 @@ class Matrix : ISpatialMathContainer { return matrix } - @JvmStatic fun initialize(n: Node): Element { val e = n as Element val t = getContainerFromElement(e) diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/math/spatial/VersionConverter.kt b/brailleblaster-core/src/main/java/org/brailleblaster/math/spatial/VersionConverter.kt index cbfc2a6d..56790f87 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/math/spatial/VersionConverter.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/math/spatial/VersionConverter.kt @@ -94,22 +94,34 @@ object VersionConverter { NumberLineConstants.ATTRIB_INTERVAL_DECIMAL, ele.namespaceURI ) - val interval = NumberLineComponent(whole=intervalWhole, - decimal=intervalDecimal) + val interval = NumberLineComponent( + whole = intervalWhole, + decimal = intervalDecimal + ) val startSegment = NumberLineComponent( - decimal=startSegmentDecimal, whole=startSegmentWhole) + decimal = startSegmentDecimal, whole = startSegmentWhole + ) val endSegment = NumberLineComponent( - whole=endSegmentWhole, decimal=endSegmentDecimal) + whole = endSegmentWhole, decimal = endSegmentDecimal + ) val startLine = NumberLineComponent( - whole=startLineWhole,decimal=startLineDecimal) - val endLine = NumberLineComponent(whole=endLineWhole, - decimal=endLineDecimal) - val text = NumberLineText(interval=interval,lineStart=startLine, - lineEnd=endLine, - segment= - NumberLineSegment(segmentStart=startSegment, - segmentEnd=endSegment, startSegmentCircle = numberLine.settings.startLineCircle, endSegmentCircle = numberLine.settings.endSegmentCircle) - ) + whole = startLineWhole, decimal = startLineDecimal + ) + val endLine = NumberLineComponent( + whole = endLineWhole, + decimal = endLineDecimal + ) + val text = NumberLineText( + interval = interval, lineStart = startLine, + lineEnd = endLine, + segment = + NumberLineSegment( + segmentStart = startSegment, + segmentEnd = endSegment, + startSegmentCircle = numberLine.settings.startLineCircle, + endSegmentCircle = numberLine.settings.endSegmentCircle + ) + ) numberLine.numberLineText = text } @@ -153,19 +165,25 @@ object VersionConverter { ) val interval = NumberLineComponent( - numerator=intervalNumerator, denominator=intervalDenominator) + numerator = intervalNumerator, denominator = intervalDenominator + ) val startSegment = NumberLineComponent( - denominator=startSegmentDenominator, numerator=startSegmentNumerator) + denominator = startSegmentDenominator, numerator = startSegmentNumerator + ) val endSegment = NumberLineComponent( - numerator=endSegmentNumerator, denominator=endSegmentDenominator) + numerator = endSegmentNumerator, denominator = endSegmentDenominator + ) val startLine = NumberLineComponent( - numerator=startLineNumerator, denominator=startLineDenominator) + numerator = startLineNumerator, denominator = startLineDenominator + ) val endLine = NumberLineComponent( - numerator=endLineNumerator, denominator=endLineDenominator) - val text = NumberLineText(interval=interval, lineStart=startLine, - lineEnd=endLine, segment= - NumberLineSegment(segmentStart=startSegment, segmentEnd=endSegment) - ) + numerator = endLineNumerator, denominator = endLineDenominator + ) + val text = NumberLineText( + interval = interval, lineStart = startLine, + lineEnd = endLine, segment = + NumberLineSegment(segmentStart = startSegment, segmentEnd = endSegment) + ) numberLine.numberLineText = text } @@ -229,19 +247,31 @@ object VersionConverter { ele.namespaceURI ) - val interval = NumberLineComponent(whole=intervalWhole, - numerator=intervalNumerator, denominator=intervalDenominator) + val interval = NumberLineComponent( + whole = intervalWhole, + numerator = intervalNumerator, denominator = intervalDenominator + ) val startSegment = NumberLineComponent( - denominator=startSegmentDenominator, numerator=startSegmentNumerator, whole=startSegmentWhole) + denominator = startSegmentDenominator, + numerator = startSegmentNumerator, + whole = startSegmentWhole + ) val endSegment = NumberLineComponent( - whole=endSegmentWhole, numerator=endSegmentNumerator, denominator=endSegmentDenominator) + whole = endSegmentWhole, numerator = endSegmentNumerator, denominator = endSegmentDenominator + ) val startLine = NumberLineComponent( - whole=startLineWhole, numerator=startLineNumerator, denominator=startLineDenominator) - val endLine = NumberLineComponent(whole=endLineWhole, numerator=endLineNumerator, denominator=endLineDenominator) - val text = NumberLineText(interval=interval, lineStart=startLine, - lineEnd=endLine, segment= - NumberLineSegment(segmentStart=startSegment, segmentEnd=endSegment) - ) + whole = startLineWhole, numerator = startLineNumerator, denominator = startLineDenominator + ) + val endLine = NumberLineComponent( + whole = endLineWhole, + numerator = endLineNumerator, + denominator = endLineDenominator + ) + val text = NumberLineText( + interval = interval, lineStart = startLine, + lineEnd = endLine, segment = + NumberLineSegment(segmentStart = startSegment, segmentEnd = endSegment) + ) numberLine.numberLineText = text } @@ -266,18 +296,22 @@ object VersionConverter { NumberLineConstants.ATTRIB_INTERVAL_WHOLE, ele.namespaceURI ) - val interval = NumberLineComponent(whole=intervalWhole) + val interval = NumberLineComponent(whole = intervalWhole) val startSegment = NumberLineComponent( - whole=startSegmentWhole) + whole = startSegmentWhole + ) val endSegment = NumberLineComponent( - whole=endSegmentWhole) + whole = endSegmentWhole + ) val startLine = NumberLineComponent( - whole=startLineWhole) - val endLine = NumberLineComponent(whole=endLineWhole) - val text = NumberLineText(interval=interval, lineStart=startLine, - lineEnd=endLine, segment= - NumberLineSegment(segmentStart=startSegment, segmentEnd=endSegment) - ) + whole = startLineWhole + ) + val endLine = NumberLineComponent(whole = endLineWhole) + val text = NumberLineText( + interval = interval, lineStart = startLine, + lineEnd = endLine, segment = + NumberLineSegment(segmentStart = startSegment, segmentEnd = endSegment) + ) numberLine.numberLineText = text } } @@ -310,14 +344,14 @@ object VersionConverter { } template.settings.isTranslateIdentifierAsMath = identifier template.identifier = MathText( - print=BBX.CONTAINER.TEMPLATE.IDENTIFIER[templateElement], - braille=translateIdentifier(BBX.CONTAINER.TEMPLATE.IDENTIFIER[templateElement], template)) + print = BBX.CONTAINER.TEMPLATE.IDENTIFIER[templateElement], + braille = translateIdentifier(BBX.CONTAINER.TEMPLATE.IDENTIFIER[templateElement], template) + ) template.settings.isLinear = BBX.CONTAINER.TEMPLATE.LINEAR[templateElement] return BBX.CONTAINER.TEMPLATE.create(template) } - @JvmStatic - fun convertMatrix(current: Element?): Element { + fun convertMatrix(current: Element?): Element { val matrix = Matrix() if (BBX.CONTAINER.MATRIX.isA(current)) { val array = BBX.CONTAINER.MATRIX.ASCII_MATH[current] @@ -341,8 +375,7 @@ object VersionConverter { return BBX.CONTAINER.MATRIX.create(matrix) } - @JvmStatic - fun convertConnectingContainer(node: Element?): Element { + fun convertConnectingContainer(node: Element?): Element { val container = ConnectingContainer() if (BBX.CONTAINER.CONNECTING_CONTAINER.isA(node)) { val isMath = BBX.CONTAINER.CONNECTING_CONTAINER.IS_MATH[node] @@ -352,14 +385,17 @@ object VersionConverter { container.settings.horizontal = horizontal container.settings.vertical = vertical container.settings.isTranslateAsMath = isMath - container.text = MathText(print=text, - braille=if (isMath) MathModuleUtils.translateMathPrint(text) else MathModuleUtils.translateMainPrint(text)) + container.text = MathText( + print = text, + braille = if (isMath) MathModuleUtils.translateMathPrint(text) else MathModuleUtils.translateMainPrint( + text + ) + ) } return BBX.CONTAINER.CONNECTING_CONTAINER.create(container) } - @JvmStatic - fun convertGrid(current: Element?): Element { + fun convertGrid(current: Element?): Element { val page = Grid() val rows = BBX.CONTAINER.SPATIAL_GRID.ROWS[current] val cols = BBX.CONTAINER.SPATIAL_GRID.COLS[current] diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/math/template/Template.kt b/brailleblaster-core/src/main/java/org/brailleblaster/math/template/Template.kt index 945f3b69..563807a3 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/math/template/Template.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/math/template/Template.kt @@ -357,18 +357,13 @@ class Template : ISpatialMathContainer { return template != null } - fun isTemplate(node: Node?): Boolean { - if (node == null || node.document == null) { - return false - } - return XMLHandler.ancestorElementIs(node) { elm: Element? -> BBX.CONTAINER.TEMPLATE.isA(elm) } - } + fun isTemplate(node: Node?): Boolean = + !(node == null || node.document == null) && XMLHandler.ancestorElementIs(node) { elm: Element? -> BBX.CONTAINER.TEMPLATE.isA(elm) } fun getTemplateParent(node: Node): Element? { return XMLHandler.ancestorVisitorElement(node) { elm -> BBX.CONTAINER.TEMPLATE.isA(elm) } } - @JvmStatic fun initialize(node: Node): Element { val e = node as Element val t = getTemplateFromElement(e) diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/math/template/TemplateSettings.kt b/brailleblaster-core/src/main/java/org/brailleblaster/math/template/TemplateSettings.kt index 0361d526..1682ce0c 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/math/template/TemplateSettings.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/math/template/TemplateSettings.kt @@ -38,7 +38,6 @@ class TemplateSettings : ISpatialMathSettings { var defaultType = SpatialMathEnum.TemplateType.SIMPLE_ENUM var defaultOperator = OPERATOR.PLUS_ENUM - @JvmStatic fun shouldFormatLinear(template: Template): Boolean { return MathModuleUtils.isNemeth && template.settings.isLinear diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/Manager.java b/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/Manager.java index ce0104b3..a70cf115 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/Manager.java +++ b/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/Manager.java @@ -396,12 +396,12 @@ public static Element getTableBrlCopy(Node node) { Element table = Manager.getTableParent(node); if (table == null) return null; - if (TableUtils.isTableCopy(table)) + if (TableUtils.INSTANCE.isTableCopy(table)) return table; ParentNode parent = table.getParent(); int index = parent.indexOf(table); if (index != parent.getChildCount() - 1 && BBX.CONTAINER.TABLE.isA(parent.getChild(index + 1)) - && TableUtils.isTableCopy((Element) parent.getChild(index + 1))) { + && TableUtils.INSTANCE.isTableCopy((Element) parent.getChild(index + 1))) { return (Element) parent.getChild(index + 1); } return null; @@ -519,7 +519,7 @@ public void openDocument(Path file) { } private void initializeAllViews() { - MathModuleUtils.retranslateSpatial(document); + MathModuleUtils.INSTANCE.retranslateSpatial(document); try (WorkingDialog ignored = new WorkingDialog( archiver != null ? "Parsing book " + getArchiver().getPath() : "Starting BrailleBlaster")) { document.translateDocument(); diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/mapping/elements/PageIndicator.java b/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/mapping/elements/PageIndicator.java index 9897dca4..2716e2ce 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/mapping/elements/PageIndicator.java +++ b/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/mapping/elements/PageIndicator.java @@ -295,7 +295,7 @@ public void startListener(BBEditorView view) { int x1 = 0; int y1 = view.getView().getLinePixel(line == 0 ? 0 : line + 1); int x2 = view.getView().getBounds().width; - FontManager.copyViewFont(manager, view, event.gc); + FontManager.Companion.copyViewFont(manager, view, event.gc); final int brailleLine = y1 + BRAILLE_LINE_OFFSET; final int printLine = y1 + PRINT_LINE_OFFSET; diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/mapping/elements/TextMapElement.java b/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/mapping/elements/TextMapElement.java index e9d57545..7c754e2c 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/mapping/elements/TextMapElement.java +++ b/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/mapping/elements/TextMapElement.java @@ -78,7 +78,7 @@ public void sort(){ public boolean isSpatialMath() { Node node = getNode(); - return getNode() != null && node.getDocument() != null && MathModuleUtils.isSpatialMath(node); + return getNode() != null && node.getDocument() != null && MathModuleUtils.INSTANCE.isSpatialMath(node); } public boolean isMathML(){ diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/mapping/maps/MapList.java b/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/mapping/maps/MapList.java index ac750f6d..4b09c4e7 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/mapping/maps/MapList.java +++ b/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/mapping/maps/MapList.java @@ -478,12 +478,12 @@ public int findNodeIndex(Node n, int startIndex) { n = potentialTable; } - if (BBX.CONTAINER.TABLE.isA(n) && !TableUtils.isTableCopy((Element) n)) { + if (BBX.CONTAINER.TABLE.isA(n) && !TableUtils.INSTANCE.isTableCopy((Element) n)) { ParentNode parent = n.getParent(); int index = parent.indexOf(n); if (index + 1 < parent.getChildCount() && BBX.CONTAINER.TABLE.isA(parent.getChild(index + 1)) - && TableUtils.isTableCopy((Element) parent.getChild(index + 1))) { + && TableUtils.INSTANCE.isTableCopy((Element) parent.getChild(index + 1))) { n = parent.getChild(index + 1); } } diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/views/wp/BrailleRenderer.kt b/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/views/wp/BrailleRenderer.kt index 1c6af9fb..e707b00a 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/views/wp/BrailleRenderer.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/views/wp/BrailleRenderer.kt @@ -101,8 +101,8 @@ class BrailleRenderer(manager: Manager, private val brailleView: BrailleView) : private fun renderNewPages() { val newPages = state.newPages - for (pair in newPages) { - handleNewPageElement(pair.first, pair.second, brailleView) + for ((first, second) in newPages) { + handleNewPageElement(first, second, brailleView) } } diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/views/wp/TextRenderer.kt b/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/views/wp/TextRenderer.kt index 2bf4e571..67f4df55 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/views/wp/TextRenderer.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/views/wp/TextRenderer.kt @@ -493,14 +493,14 @@ class TextRenderer(manager: Manager, private val textView: TextView) : Renderer( private fun renderNewPages() { val newPages = state.newPages - for (pair in newPages) { - handleNewPageElement(pair.first, pair.second, textView) + for ((first, second) in newPages) { + handleNewPageElement(first, second, textView) } } private fun renderLineNumbers() { - for (lineNumber in lineNumberList) { - handleLineNumber(lineNumber.second, lineNumber.first) + for ((first, second) in lineNumberList) { + handleLineNumber(second, first) } } diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/views/wp/TextView.kt b/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/views/wp/TextView.kt index 23ac9379..62557250 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/views/wp/TextView.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/views/wp/TextView.kt @@ -1082,7 +1082,7 @@ class TextView(manager: Manager, sash: Composite) : WPView(manager, sash) { private fun getPreviousPageIndicator(caretOffset: Int): PageIndicator? { val line = view.getLineAtOffset(caretOffset) var prevIndicator = - if (manager.text.paintedElements.pageIndicators.isNotEmpty()) manager.text.paintedElements.pageIndicators[0] else null + manager.text.paintedElements.pageIndicators.firstOrNull() for (pi in manager.text.paintedElements.pageIndicators) { if (pi.line >= line) { return prevIndicator diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/views/wp/tableEditor/TableEditor.java b/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/views/wp/tableEditor/TableEditor.java index 7b2b777b..502ff3de 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/views/wp/tableEditor/TableEditor.java +++ b/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/views/wp/tableEditor/TableEditor.java @@ -147,26 +147,26 @@ public void open(Shell parent, Element table, int columns, List { @@ -547,7 +547,7 @@ private void open(Consumer callback, Consumer onCancel) { options.clear(); if (!isFacingTable(tableNode) && !isFacingTable((Element) tableNode.getParent())) { options.addAll(findOptions(tableNode)); - List captions = TableUtils.findCaption(tableNode, m.getEngine().getStyleMap()); + List captions = TableUtils.INSTANCE.findCaption(tableNode, m.getEngine().getStyleMap()); List> rows = getTableCells(tableNode); Element tnContainer = copyTNContainer(getTranscribersNote(tableNode)); state = new InternalTable(rows, captions, tnContainer, getTableType(tableNode)); @@ -1500,7 +1500,7 @@ private Element createTNContainer(List tnTexts) { private Element createTNContainer(Element note, List firstRow) { Element container = BBX.CONTAINER.TABLETN.create(); - container.appendChild(BBXUtils.wrapAsTransNote(note)); + container.appendChild(BBXUtils.INSTANCE.wrapAsTransNote(note)); switch (state.getType()) { case STAIRSTEP: for (int i = 0; i < firstRow.size(); i++) { @@ -1585,15 +1585,15 @@ private Node[] generateNewTable(List> nodes, int cols, int rows, Elem options.forEach((o) -> { if (o == TableUtils.SimpleTableOptions.CUSTOM_WIDTHS) { if (widths != null) { - TableUtils.applyCustomSimpleTableWidths(newTable, widths); + TableUtils.INSTANCE.applyCustomSimpleTableWidths(newTable, widths); } else { - int[] existingWidths = TableUtils.getCustomSimpleTableWidths(existingTable); + int[] existingWidths = TableUtils.INSTANCE.getCustomSimpleTableWidths(existingTable); if (existingWidths != null) { - TableUtils.applyCustomSimpleTableWidths(newTable, existingWidths); + TableUtils.INSTANCE.applyCustomSimpleTableWidths(newTable, existingWidths); } } } else { - TableUtils.applySimpleTableOption(newTable, o); + TableUtils.INSTANCE.applySimpleTableOption(newTable, o); } }); } @@ -1825,7 +1825,7 @@ private void deleteTable() { int index = tableParent.indexOf(tableNode); if (tableParent.getChildCount() > index + 1 && BBX.CONTAINER.TABLE.isA(tableParent.getChild(index + 1)) - && TableUtils.isTableCopy((Element) tableParent.getChild(index + 1))) { + && TableUtils.INSTANCE.isTableCopy((Element) tableParent.getChild(index + 1))) { tableParent.removeChild(index + 1); } tableParent.removeChild(index); @@ -2015,15 +2015,15 @@ private Element[] getFacingTableParents(Element parent) { private List findOptions(Element table) { List options = new ArrayList<>(); if ("simple".equals(table.getAttributeValue("format"))) { - if (TableUtils.hasSimpleTableOption(TableUtils.SimpleTableOptions.ONE_CELL_BETWEEN_COLUMNS, table)) + if (TableUtils.INSTANCE.hasSimpleTableOption(TableUtils.SimpleTableOptions.ONE_CELL_BETWEEN_COLUMNS, table)) options.add(TableUtils.SimpleTableOptions.ONE_CELL_BETWEEN_COLUMNS); - if (TableUtils.hasSimpleTableOption(TableUtils.SimpleTableOptions.ROW_HEADING_DISABLED, table)) + if (TableUtils.INSTANCE.hasSimpleTableOption(TableUtils.SimpleTableOptions.ROW_HEADING_DISABLED, table)) options.add(TableUtils.SimpleTableOptions.ROW_HEADING_DISABLED); - if (TableUtils.hasSimpleTableOption(TableUtils.SimpleTableOptions.COLUMN_HEADING_DISABLED, table)) + if (TableUtils.INSTANCE.hasSimpleTableOption(TableUtils.SimpleTableOptions.COLUMN_HEADING_DISABLED, table)) options.add(TableUtils.SimpleTableOptions.COLUMN_HEADING_DISABLED); - if (TableUtils.hasSimpleTableOption(TableUtils.SimpleTableOptions.GUIDE_DOTS_DISABLED, table)) + if (TableUtils.INSTANCE.hasSimpleTableOption(TableUtils.SimpleTableOptions.GUIDE_DOTS_DISABLED, table)) options.add(TableUtils.SimpleTableOptions.GUIDE_DOTS_DISABLED); - if (TableUtils.hasSimpleTableOption(TableUtils.SimpleTableOptions.CUSTOM_WIDTHS, table)) + if (TableUtils.INSTANCE.hasSimpleTableOption(TableUtils.SimpleTableOptions.CUSTOM_WIDTHS, table)) options.add(TableUtils.SimpleTableOptions.CUSTOM_WIDTHS); } return options; diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/mvc/modules/misc/ClipboardModule.kt b/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/mvc/modules/misc/ClipboardModule.kt index b7f7d94f..293243ad 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/mvc/modules/misc/ClipboardModule.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/mvc/modules/misc/ClipboardModule.kt @@ -411,7 +411,7 @@ class ClipboardModule(private val manager: BBSimpleManager) : SimpleListener { // so that pasting into a new/blank document preserves the source style if (BBX.BLOCK.STYLE.isA(firstClipBlock)) { BBX._ATTRIB_TYPE[parent as Element] = "STYLE" - BBX._ATTRIB_OVERRIDE_STYLE[parent as Element] = BBX._ATTRIB_OVERRIDE_STYLE[firstClipBlock] + BBX._ATTRIB_OVERRIDE_STYLE[parent] = BBX._ATTRIB_OVERRIDE_STYLE[firstClipBlock] } for (i in 0..(textTransfer)) } else { // SWT cannot setContents to be an empty string, because you're diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/mvc/modules/views/EmphasisModule.kt b/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/mvc/modules/views/EmphasisModule.kt index f40c15bf..5d5ff44f 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/mvc/modules/views/EmphasisModule.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/perspectives/mvc/modules/views/EmphasisModule.kt @@ -333,7 +333,7 @@ object EmphasisModule : AbstractModule(), SimpleListener { if (text.isEmpty()) { return null } - var pivot = when { + val pivot = when { caretOffset < text.length && isWordCharacter(text[caretOffset]) -> caretOffset caretOffset > 0 && isWordCharacter(text[caretOffset - 1]) -> caretOffset - 1 else -> return null diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/tools/InsertBookmarkTool.kt b/brailleblaster-core/src/main/java/org/brailleblaster/tools/InsertBookmarkTool.kt index 0b56a7da..9f29af5c 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/tools/InsertBookmarkTool.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/tools/InsertBookmarkTool.kt @@ -71,7 +71,7 @@ class InsertBookmarkTool(parent: Manager) : Dialog(parent.wpManager.shell, SWT.N } EasySWT.addEnterListener(entryBox) { - if (!entryBox.text.isEmpty() && !bookmarksList.items.contains(entryBox.text)) { + if (entryBox.text.isNotEmpty() && !bookmarksList.items.contains(entryBox.text)) { addBookmark(bbData, entryBox.text) //Refresh manager to avoid errors when navigating to newly added bookmarks //Not sure why it works, but it does fix the problem. @@ -89,7 +89,7 @@ class InsertBookmarkTool(parent: Manager) : Dialog(parent.wpManager.shell, SWT.N val bookmarkAtCursor = Button(buttonsGroup, SWT.PUSH) bookmarkAtCursor.text = "Add Bookmark at Cursor" bookmarkAtCursor.addListener(SWT.Selection) { - if (!entryBox.text.isEmpty() && !bookmarksList.items.contains(entryBox.text)) { + if (entryBox.text.isNotEmpty() && !bookmarksList.items.contains(entryBox.text)) { addBookmark(bbData, entryBox.text) //Refresh manager to avoid errors when navigating to newly added bookmarks bbData.manager.refresh() diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/util/StyleId.kt b/brailleblaster-core/src/main/java/org/brailleblaster/util/StyleId.kt index c4e3cb3e..90e2c8bc 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/util/StyleId.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/util/StyleId.kt @@ -62,7 +62,7 @@ class StyleId(utd: UTDManager) { companion object { var slist: MutableList = ArrayList() - @JvmStatic + fun getWholeFromMain(main: String): List { return slist.filter { it.main == main }.map { it.whole } } diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/wordprocessor/FontManager.kt b/brailleblaster-core/src/main/java/org/brailleblaster/wordprocessor/FontManager.kt index cff821b1..b0c1e94b 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/wordprocessor/FontManager.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/wordprocessor/FontManager.kt @@ -319,28 +319,23 @@ class FontManager(val m: Manager) { } } - @JvmStatic fun newTextFont(): Font { return SELECTED_TEXT_FONT.newFont(SELECTED_TEXT_FONT.defaultHeight + sizeDelta) } - @JvmStatic fun newBrailleFont(): Font { refreshBrailleFont() return SELECTED_BRAILLE_FONT.newFont(SELECTED_BRAILLE_FONT.defaultHeight + sizeDelta) } - @JvmStatic fun increaseFontSetting() { adjustSizeDelta(FONT_SIZE_DELTA) } - @JvmStatic fun decreaseFontSetting() { adjustSizeDelta(FONT_SIZE_DELTA * -1) } - @JvmStatic fun copyViewFont(m: Manager, view: BBEditorView, gc: GC) { if (view === m.text) { gc.font = m.textView.font @@ -349,7 +344,6 @@ class FontManager(val m: Manager) { } } - @JvmStatic val isShowBraille: Boolean get() = (BBIni.propertyFileManager.getProperty(SETTING_SHOW_BRAILLE, "true") == "true") diff --git a/brailleblaster-core/src/main/java/org/brailleblaster/wordprocessor/WPManager.kt b/brailleblaster-core/src/main/java/org/brailleblaster/wordprocessor/WPManager.kt index b9551213..06f9ab7c 100644 --- a/brailleblaster-core/src/main/java/org/brailleblaster/wordprocessor/WPManager.kt +++ b/brailleblaster-core/src/main/java/org/brailleblaster/wordprocessor/WPManager.kt @@ -386,9 +386,9 @@ class WPManager private constructor(val usageManager: UsageManager) { val cause = if (fileName != null && !Files.exists(fileName)) { NoSuchFileException(fileName.toString()) } else { - FileSystemException(fileName?.toString(), null, "Cannot open file") + FileSystemException(fileName.toString(), null, "Cannot open file") } - throw BBNotifyException(fileOpenMessage(fileName!!, cause)) + throw BBNotifyException(fileOpenMessage(fileName, cause)) } if (fileName in RecentDocs.defaultRecentDocs.recentDocs) { val removeFromRecentDocs = MessageBox(shell, SWT.ICON_ERROR or SWT.YES or SWT.NO).apply { diff --git a/brailleblaster-core/src/test/java/org/brailleblaster/archiver2/ArchiverRecoveryThreadTest.java b/brailleblaster-core/src/test/java/org/brailleblaster/archiver2/ArchiverRecoveryThreadTest.java index a30f41bd..83562a54 100644 --- a/brailleblaster-core/src/test/java/org/brailleblaster/archiver2/ArchiverRecoveryThreadTest.java +++ b/brailleblaster-core/src/test/java/org/brailleblaster/archiver2/ArchiverRecoveryThreadTest.java @@ -28,6 +28,6 @@ public void garbageRecoveryFile_rt6844() throws IOException { FileUtils.write(BBIni.getRecentSaves().toFile(), "\0\0\0\0", StandardCharsets.UTF_8, true); // should not fail - ArchiverRecoverThread.readRecentSaves(); + ArchiverRecoverThread.Companion.readRecentSaves(); } } diff --git a/brailleblaster-core/src/test/java/org/brailleblaster/bbx/fixer/NodeTreeSplitterTest.java b/brailleblaster-core/src/test/java/org/brailleblaster/bbx/fixer/NodeTreeSplitterTest.java index bda35920..c41fe922 100644 --- a/brailleblaster-core/src/test/java/org/brailleblaster/bbx/fixer/NodeTreeSplitterTest.java +++ b/brailleblaster-core/src/test/java/org/brailleblaster/bbx/fixer/NodeTreeSplitterTest.java @@ -248,7 +248,7 @@ public void unwrapTargetOnlyChild() { Element br = TestXMLUtils.getTestIdElement(doc, "target"); // do not use testNodeTreeSplit as the paragraph should be removed - NodeTreeSplitter.split(p, br); + NodeTreeSplitter.INSTANCE.split(p, br); new XMLElementAssert(root, null) .nextChildIs(childAssert -> childAssert @@ -416,7 +416,7 @@ public void unwrapOnlyContainerInsideContainer() { private static void testNodeTreeSplit(Element root, Node splitAt) { List allNodes = Lists.newArrayList(FastXPath.descendant(root.getDocument())::iterator); - NodeTreeSplitter.split(root, splitAt); + NodeTreeSplitter.INSTANCE.split(root, splitAt); for (Node origNode : allNodes) { if (origNode.getDocument() == null) { diff --git a/brailleblaster-core/src/test/java/org/brailleblaster/frontmatter/TOCBuilderTest.java b/brailleblaster-core/src/test/java/org/brailleblaster/frontmatter/TOCBuilderTest.java index 352e860c..6a32a9db 100644 --- a/brailleblaster-core/src/test/java/org/brailleblaster/frontmatter/TOCBuilderTest.java +++ b/brailleblaster-core/src/test/java/org/brailleblaster/frontmatter/TOCBuilderTest.java @@ -43,7 +43,7 @@ public class TOCBuilderTest { public static void openTocTools(BBTestRunner test) { - if (!TOCBuilderBBX.isEnabled(test.manager)) { + if (!TOCBuilderBBX.Companion.isEnabled(test.manager)) { test.openMenuItem(TopMenu.TOOLS, "TOC Builder"); } } @@ -2312,13 +2312,13 @@ public void pagePrefixDisabledDuringNextBoot_rt6018(){ @Test public void isNodeMovableTest() { Document doc = TestXMLUtils.generateBookDoc("", "

who was phone

test

"); - doc = BookToBBXConverter.fromConfig().convert(doc); + doc = BookToBBXConverter.Companion.fromConfig("nimas").convert(doc); Element after = TestXMLUtils.getTestIdElement(doc, "after"); Element span = (Element) after.getChild(0); Text text = (Text) span.getChild(0); try { - Assert.assertEquals(TOCBuilderBBX.isPageMovable(text), after); + Assert.assertEquals(TOCBuilderBBX.Companion.isPageMovable(text), after); } catch (Throwable e) { throw new NodeException("failed", text, e); } diff --git a/brailleblaster-core/src/test/java/org/brailleblaster/frontmatter/VolumeTest.java b/brailleblaster-core/src/test/java/org/brailleblaster/frontmatter/VolumeTest.java index 98b4ee74..6d3e1bf1 100644 --- a/brailleblaster-core/src/test/java/org/brailleblaster/frontmatter/VolumeTest.java +++ b/brailleblaster-core/src/test/java/org/brailleblaster/frontmatter/VolumeTest.java @@ -188,7 +188,7 @@ public void insertManyVolumes() { nodeToVolumize = (Text) StreamSupport.stream(FastXPath.descendantAndFollowing(startNodeProcessing).spliterator(), false) .filter(curNode -> curNode instanceof Text) .skip(textNodesPerVolume + endOffset) - .filter(curNode -> !BBXUtils.isPageNumAncestor(curNode)) + .filter(curNode -> !BBXUtils.INSTANCE.isPageNumAncestor(curNode)) .findFirst().orElse(null); if (nodeToVolumize == null) { //end of document diff --git a/brailleblaster-core/src/test/java/org/brailleblaster/math/spatial/MatrixTest.java b/brailleblaster-core/src/test/java/org/brailleblaster/math/spatial/MatrixTest.java index 642316d4..3b8515f6 100644 --- a/brailleblaster-core/src/test/java/org/brailleblaster/math/spatial/MatrixTest.java +++ b/brailleblaster-core/src/test/java/org/brailleblaster/math/spatial/MatrixTest.java @@ -64,7 +64,7 @@ public void openMatrixBuilder(BBTestRunner bb) { } public void setNoPassage(BBTestRunner bb) { - if (!MathModuleUtils.isNemeth()) { + if (!MathModuleUtils.INSTANCE.isNemeth()) { bb.bot.activeShell().bot().menu(TemplateConstants.SETTINGS).menu(GridConstants.PASSAGE_TYPE).menu(Passage.NONE.getPrettyName()) .click(); } @@ -111,10 +111,10 @@ public void fillWideEntries(BBTestRunner bb, int wideTestChars) { @Test(enabled = false) public void nemethEllipsis() { BBTestRunner bb = new BBTestRunner(twoParagraphs); - if (!MathModuleUtils.isNemeth()) { + if (!MathModuleUtils.INSTANCE.isNemeth()) { TestUtils.changeSettings(bb, TranslationSettingsTab.UEB_PLUS_NEMETH); } - Assert.assertTrue(MathModuleUtils.isNemeth(), "Settings should be nemeth"); + Assert.assertTrue(MathModuleUtils.INSTANCE.isNemeth(), "Settings should be nemeth"); bb.textViewTools.navigateToEndOfLine(); openMatrixBuilder(bb); clickFillEllipsis(bb); @@ -129,10 +129,10 @@ public void nemethEllipsis() { @Test(enabled = false) public void skinnyMatrixNemeth() { BBTestRunner bb = new BBTestRunner(twoParagraphs); - if (!MathModuleUtils.isNemeth()) { + if (!MathModuleUtils.INSTANCE.isNemeth()) { TestUtils.changeSettings(bb, TranslationSettingsTab.UEB_PLUS_NEMETH); } - Assert.assertTrue(MathModuleUtils.isNemeth(), "Settings should be nemeth"); + Assert.assertTrue(MathModuleUtils.INSTANCE.isNemeth(), "Settings should be nemeth"); bb.textViewTools.navigateToEndOfLine(); openMatrixBuilder(bb); fillSkinnyEntries(bb); @@ -146,10 +146,10 @@ public void skinnyMatrixNemeth() { @Test(enabled = false) public void skinnyMatrixUeb() { BBTestRunner bb = new BBTestRunner(twoParagraphs); - if (MathModuleUtils.isNemeth()) { + if (MathModuleUtils.INSTANCE.isNemeth()) { TestUtils.changeSettings(bb, TranslationSettingsTab.UEB); } - Assert.assertFalse(MathModuleUtils.isNemeth(), "Settings should be Ueb"); + Assert.assertFalse(MathModuleUtils.INSTANCE.isNemeth(), "Settings should be Ueb"); bb.textViewTools.navigateToEndOfLine(); openMatrixBuilder(bb); fillSkinnyEntries(bb); @@ -163,10 +163,10 @@ public void skinnyMatrixUeb() { @Test(enabled = false) public void blankBlockMatrixNemeth() { BBTestRunner bb = new BBTestRunner(twoParagraphs); - if (!MathModuleUtils.isNemeth()) { + if (!MathModuleUtils.INSTANCE.isNemeth()) { TestUtils.changeSettings(bb, TranslationSettingsTab.UEB_PLUS_NEMETH); } - Assert.assertTrue(MathModuleUtils.isNemeth(), "Settings should be nemeth"); + Assert.assertTrue(MathModuleUtils.INSTANCE.isNemeth(), "Settings should be nemeth"); bb.textViewTools.navigateToEndOfLine(); openMatrixBuilder(bb); setWideType(bb, Wide.BLOCK_BLANK); @@ -181,10 +181,10 @@ public void blankBlockMatrixNemeth() { @Test(enabled = false) public void blankBlockMatrixUeb() { BBTestRunner bb = new BBTestRunner(twoParagraphs); - if (MathModuleUtils.isNemeth()) { + if (MathModuleUtils.INSTANCE.isNemeth()) { TestUtils.changeSettings(bb, TranslationSettingsTab.UEB); } - Assert.assertFalse(MathModuleUtils.isNemeth(), "Settings should be ueb"); + Assert.assertFalse(MathModuleUtils.INSTANCE.isNemeth(), "Settings should be ueb"); bb.textViewTools.navigateToEndOfLine(); openMatrixBuilder(bb); setWideType(bb, Wide.BLOCK_BLANK); @@ -199,10 +199,10 @@ public void blankBlockMatrixUeb() { @Test(enabled = false) public void indentMatrixNemeth() { BBTestRunner bb = new BBTestRunner(twoParagraphs); - if (!MathModuleUtils.isNemeth()) { + if (!MathModuleUtils.INSTANCE.isNemeth()) { TestUtils.changeSettings(bb, TranslationSettingsTab.UEB_PLUS_NEMETH); } - Assert.assertTrue(MathModuleUtils.isNemeth(), "Settings should be nemeth"); + Assert.assertTrue(MathModuleUtils.INSTANCE.isNemeth(), "Settings should be nemeth"); bb.textViewTools.navigateToEndOfLine(); openMatrixBuilder(bb); setWideType(bb, Wide.INDENT_COLUMN); @@ -217,10 +217,10 @@ public void indentMatrixNemeth() { @Test(enabled = false) public void indentMatrixUeb() { BBTestRunner bb = new BBTestRunner(twoParagraphs); - if (MathModuleUtils.isNemeth()) { + if (MathModuleUtils.INSTANCE.isNemeth()) { TestUtils.changeSettings(bb, TranslationSettingsTab.UEB); } - Assert.assertFalse(MathModuleUtils.isNemeth(), "Settings should be ueb"); + Assert.assertFalse(MathModuleUtils.INSTANCE.isNemeth(), "Settings should be ueb"); bb.textViewTools.navigateToEndOfLine(); openMatrixBuilder(bb); setWideType(bb, Wide.INDENT_COLUMN); diff --git a/brailleblaster-core/src/test/java/org/brailleblaster/math/spatial/NumberLineTest.java b/brailleblaster-core/src/test/java/org/brailleblaster/math/spatial/NumberLineTest.java index b561d427..1e193664 100644 --- a/brailleblaster-core/src/test/java/org/brailleblaster/math/spatial/NumberLineTest.java +++ b/brailleblaster-core/src/test/java/org/brailleblaster/math/spatial/NumberLineTest.java @@ -169,7 +169,7 @@ public void openNumberLineEditor(BBTestRunner bb) { } public void setPassage(BBTestRunner bb) { - if (!MathModuleUtils.isNemeth()) { + if (!MathModuleUtils.INSTANCE.isNemeth()) { bb.bot .activeShell() .bot() diff --git a/brailleblaster-core/src/test/java/org/brailleblaster/mathml/MathMLASCIIEditTest.java b/brailleblaster-core/src/test/java/org/brailleblaster/mathml/MathMLASCIIEditTest.java index 1e20c001..6a984157 100644 --- a/brailleblaster-core/src/test/java/org/brailleblaster/mathml/MathMLASCIIEditTest.java +++ b/brailleblaster-core/src/test/java/org/brailleblaster/mathml/MathMLASCIIEditTest.java @@ -244,7 +244,7 @@ public void rt5765_math_and_grave_accent() { public void rt5675_math_and_toc() { BBTestRunner bb = new BBTestRunner(blank); BBIni.setDebuggingEnabled(); - if (!TOCBuilderBBX.isEnabled(bb.manager)) { + if (!TOCBuilderBBX.Companion.isEnabled(bb.manager)) { bb.openMenuItem(TopMenu.TOOLS, "TOC Builder"); } if (!bb.bot.checkBox("Find Page | Page Prefix").isChecked()) { diff --git a/brailleblaster-core/src/test/java/org/brailleblaster/mathml/NemethIndicatorsTest.java b/brailleblaster-core/src/test/java/org/brailleblaster/mathml/NemethIndicatorsTest.java index 5125d578..f51699e4 100644 --- a/brailleblaster-core/src/test/java/org/brailleblaster/mathml/NemethIndicatorsTest.java +++ b/brailleblaster-core/src/test/java/org/brailleblaster/mathml/NemethIndicatorsTest.java @@ -37,12 +37,12 @@ public class NemethIndicatorsTest { "

" + wizard1 + "

" + "

" + wizard2 + "

" + "

" + wizard3 + "

"); public void clickInline(BBTestRunner bb) { - NemethIndicators.inline(bb.manager); + NemethIndicators.INSTANCE.inline(bb.manager); // bb.openMenuItem(MenuManager.TopMenu.MATH, MathModule.NEMETH_TOGGLE); } public void clickBlock(BBTestRunner bb) { - NemethIndicators.block(bb.manager); + NemethIndicators.INSTANCE.block(bb.manager); // bb.openMenuItem(MenuManager.TopMenu.MATH, MathModule.NEMETH_TOGGLE); } @@ -214,7 +214,7 @@ public void block_all_block_mult_lines() { } public void clickAddIndicators(BBTestRunner bb) { - NemethIndicators.inline(bb.manager); + NemethIndicators.INSTANCE.inline(bb.manager); } @Test(enabled = false) diff --git a/brailleblaster-core/src/test/java/org/brailleblaster/settings/ui/SettingsChangeTest.java b/brailleblaster-core/src/test/java/org/brailleblaster/settings/ui/SettingsChangeTest.java index 6927f0bc..6c65e48c 100644 --- a/brailleblaster-core/src/test/java/org/brailleblaster/settings/ui/SettingsChangeTest.java +++ b/brailleblaster-core/src/test/java/org/brailleblaster/settings/ui/SettingsChangeTest.java @@ -52,7 +52,7 @@ public void changeTranslationTest() { String curTrans = test.manager.getDocument().getEngine().getBrailleSettings().getMainTranslationTable(); String curTransNoExceptions = curTrans.substring(0, curTrans.lastIndexOf(',')); Assert.assertEquals( - UTDConfig.loadBrailleSettings( + UTDConfig.INSTANCE.loadBrailleSettings( BBIni.loadAutoProgramDataFile(UTDManager.UTD_FOLDER, "EBAE" + UTDManager.BRAILLE_SETTINGS_NAME) ).getMainTranslationTable(), curTransNoExceptions @@ -76,7 +76,7 @@ public void changeTranslationTest() { curTrans = test.manager.getDocument().getEngine().getBrailleSettings().getMainTranslationTable(); curTransNoExceptions = curTrans.substring(0, curTrans.lastIndexOf(',')); Assert.assertEquals( - UTDConfig.loadBrailleSettings( + UTDConfig.INSTANCE.loadBrailleSettings( BBIni.loadAutoProgramDataFile(UTDManager.UTD_FOLDER, "UEB-UNCONTRACTED" + UTDManager.BRAILLE_SETTINGS_NAME) ).getMainTranslationTable(), curTransNoExceptions diff --git a/brailleblaster-core/src/test/java/org/brailleblaster/utd/BRFWriterTest.java b/brailleblaster-core/src/test/java/org/brailleblaster/utd/BRFWriterTest.java index d20121f9..8fff149b 100644 --- a/brailleblaster-core/src/test/java/org/brailleblaster/utd/BRFWriterTest.java +++ b/brailleblaster-core/src/test/java/org/brailleblaster/utd/BRFWriterTest.java @@ -57,25 +57,25 @@ private Object[][] brfDataProvider() { for (String testName : testNames) { UTDTranslationEngine engine = newEngine(); engine.getBrailleSettings().setUseAsciiBraille(true); - engine.setBrailleSettings(UTDConfig.loadBrailleSettings( + engine.setBrailleSettings(UTDConfig.INSTANCE.loadBrailleSettings( BBData.INSTANCE.getBrailleblasterPath("programData", "utd", "EBAE.brailleSettings.xml"))); paramList.add(new Object[]{engine, testName, "EBAE-useAsciiBraille"}); engine = newEngine(); engine.getBrailleSettings().setUseAsciiBraille(false); - engine.setBrailleSettings(UTDConfig.loadBrailleSettings( + engine.setBrailleSettings(UTDConfig.INSTANCE.loadBrailleSettings( BBData.INSTANCE.getBrailleblasterPath("programData", "utd", "EBAE.brailleSettings.xml"))); paramList.add(new Object[]{engine, testName, "EBAE-charToDots"}); engine = newEngine(); engine.getBrailleSettings().setUseAsciiBraille(true); - engine.setBrailleSettings(UTDConfig.loadBrailleSettings( + engine.setBrailleSettings(UTDConfig.INSTANCE.loadBrailleSettings( BBData.INSTANCE.getBrailleblasterPath("programData", "utd", "UEB.brailleSettings.xml"))); paramList.add(new Object[]{engine, testName, "UEB-useAsciiBraille"}); engine = newEngine(); engine.getBrailleSettings().setUseAsciiBraille(false); - engine.setBrailleSettings(UTDConfig.loadBrailleSettings( + engine.setBrailleSettings(UTDConfig.INSTANCE.loadBrailleSettings( BBData.INSTANCE.getBrailleblasterPath("programData", "utd", "UEB.brailleSettings.xml"))); paramList.add(new Object[]{engine, testName, "UEB-charToDots"}); } @@ -89,10 +89,10 @@ private static UTDTranslationEngine newEngine() { File bbProgramData = new File(BBData.INSTANCE.getBrailleblasterPath(), "programData"); engine.getBrailleTranslator().setDataPath(bbProgramData.getAbsolutePath()); File UTD_FOLDER = new File(bbProgramData, "utd"); - engine.setPageSettings(UTDConfig.loadPageSettings(new File(UTD_FOLDER, "pageSettings.xml"))); - engine.setBrailleSettings(UTDConfig.loadBrailleSettings(new File(UTD_FOLDER, "UEB.brailleSettings.xml"))); + engine.setPageSettings(UTDConfig.INSTANCE.loadPageSettings(new File(UTD_FOLDER, "pageSettings.xml"))); + engine.setBrailleSettings(UTDConfig.INSTANCE.loadBrailleSettings(new File(UTD_FOLDER, "UEB.brailleSettings.xml"))); engine.setStyleDefinitions(UTDConfig.loadStyleDefinitions(new File(UTD_FOLDER, "styleDefs.xml"))); - UTDConfig.loadMappings(engine, UTD_FOLDER, "nimas"); + UTDConfig.INSTANCE.loadMappings(engine, UTD_FOLDER, "nimas"); return engine; } diff --git a/brailleblaster-core/src/test/java/org/brailleblaster/util/UtilsTest.java b/brailleblaster-core/src/test/java/org/brailleblaster/util/UtilsTest.java index ad8f5cb4..104843e6 100644 --- a/brailleblaster-core/src/test/java/org/brailleblaster/util/UtilsTest.java +++ b/brailleblaster-core/src/test/java/org/brailleblaster/util/UtilsTest.java @@ -72,7 +72,7 @@ public void pageNumTest() { .filter(node -> node instanceof Text) .findFirst() .get(); - Assert.assertTrue(BBXUtils.isPageNumAncestor(textNode)); - Assert.assertTrue(BBXUtils.isPageNumAncestor(textNode.getParent())); + Assert.assertTrue(BBXUtils.INSTANCE.isPageNumAncestor(textNode)); + Assert.assertTrue(BBXUtils.INSTANCE.isPageNumAncestor(textNode.getParent())); } } diff --git a/pom.xml b/pom.xml index 41884f46..28ee2c63 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ child.project.url.inherit.append.path="false"> true 1.11.0 26.1.0 - 2.0.17 + 2.0.18 1.0.3 0.7.2-2 7733050ea6b5152412e6ddb6dec996f9e024a082 @@ -70,7 +70,7 @@ child.project.url.inherit.append.path="false"> 2.12.2 2.0.2 3.6.3 - 4.3.1 + 4.5 5.23.0 f5b2edaee2 @@ -244,13 +244,13 @@ child.project.url.inherit.append.path="false"> org.graalvm.polyglot js - 25.1.3 + 25.2.4 pom org.graalvm.js js-scriptengine - 25.1.3 + 25.2.4 org.apache.commons @@ -344,7 +344,7 @@ child.project.url.inherit.append.path="false"> org.jsoup jsoup - 1.22.2 + 1.23.1 xom @@ -417,12 +417,12 @@ child.project.url.inherit.append.path="false"> ch.qos.logback logback-core - 1.5.38 + 1.6.1 ch.qos.logback logback-classic - 1.5.38 + 1.6.1 org.assertj @@ -456,12 +456,12 @@ child.project.url.inherit.append.path="false"> net.bytebuddy byte-buddy - 1.18.10 + 1.18.11 net.bytebuddy byte-buddy-agent - 1.18.10 + 1.18.11 org.testng @@ -500,7 +500,7 @@ child.project.url.inherit.append.path="false"> org.jspecify jspecify - 1.0.0 + 1.0.1 provided diff --git a/utd/src/main/java/org/brailleblaster/utd/BrailleSettings.kt b/utd/src/main/java/org/brailleblaster/utd/BrailleSettings.kt index 32a1c859..93b21a5f 100644 --- a/utd/src/main/java/org/brailleblaster/utd/BrailleSettings.kt +++ b/utd/src/main/java/org/brailleblaster/utd/BrailleSettings.kt @@ -90,7 +90,6 @@ data class InsertionPatternEntry @JvmOverloads constructor( ) { companion object { - @JvmStatic fun listToMap(listInsertions: List?): Map { return listInsertions?.associate { it.matchPattern to it.insertionDots } ?: emptyMap() } diff --git a/utd/src/main/java/org/brailleblaster/utd/MetadataHelper.kt b/utd/src/main/java/org/brailleblaster/utd/MetadataHelper.kt index 4523e0d3..ddb07b54 100644 --- a/utd/src/main/java/org/brailleblaster/utd/MetadataHelper.kt +++ b/utd/src/main/java/org/brailleblaster/utd/MetadataHelper.kt @@ -31,7 +31,6 @@ object MetadataHelper { private const val PRINT = "printPage" private const val BRL = "braillePage" - @JvmStatic fun changePrintPageNumber(doc: Document, originalNum: String, newNum: String?, volume: String?, skip: Boolean) { addNewChangeMeta(doc, PRINT, originalNum, newNum, null, null, combined = false, @@ -55,7 +54,6 @@ object MetadataHelper { ) } - @JvmStatic fun changePrintPageNumber( doc: Document, originalNum: String, newNum: String?, newContLetter: String?, pageType: String?, volume: String?, skip: Boolean @@ -69,7 +67,6 @@ object MetadataHelper { ) } - @JvmStatic fun markBlankPrintPageNumber(doc: Document, originalNum: String, volume: String?, skip: Boolean) { addNewChangeMeta(doc, PRINT, originalNum, null, null, null, combined = false, @@ -80,7 +77,6 @@ object MetadataHelper { ) } - @JvmStatic fun changeBraillePageNumber( doc: Document, originalNum: String, @@ -170,12 +166,10 @@ object MetadataHelper { head?.appendChild(meta) } - @JvmStatic fun findPrintPageChange(doc: Document, originalNum: String): Element? { return findPageChange(doc, originalNum, PRINT) } - @JvmStatic fun findBraillePageChange(doc: Document, originalNum: String): Element? { return findPageChange(doc, originalNum, BRL) } @@ -288,7 +282,6 @@ object MetadataHelper { return adaptedMeta } - @JvmStatic fun getUTDMeta(doc: Document?): List { val returnList: MutableList = ArrayList() val head = doc.getDocumentHead() diff --git a/utd/src/main/java/org/brailleblaster/utd/actions/EmphasisActions.kt b/utd/src/main/java/org/brailleblaster/utd/actions/EmphasisActions.kt index 8ac51461..8724fb50 100644 --- a/utd/src/main/java/org/brailleblaster/utd/actions/EmphasisActions.kt +++ b/utd/src/main/java/org/brailleblaster/utd/actions/EmphasisActions.kt @@ -146,7 +146,6 @@ class TransNoteAction : BaseEmphasisAction(), IBlockAction { const val UEB_END = "`.>" const val EBAE_START = ",'" const val EBAE_END = ",'" - @JvmStatic fun getStart(brailleStandard: String): String { return if (brailleStandard.lowercase(Locale.getDefault()).contains("EBAE".lowercase(Locale.getDefault()))) { EBAE_START @@ -155,7 +154,6 @@ class TransNoteAction : BaseEmphasisAction(), IBlockAction { } } - @JvmStatic fun getEnd(brailleStandard: String): String { return if (brailleStandard.lowercase(Locale.getDefault()).contains("EBAE".lowercase(Locale.getDefault()))) { EBAE_END diff --git a/utd/src/main/java/org/brailleblaster/utd/actions/XsltAction.kt b/utd/src/main/java/org/brailleblaster/utd/actions/XsltAction.kt index d280de8b..fc6fb55f 100644 --- a/utd/src/main/java/org/brailleblaster/utd/actions/XsltAction.kt +++ b/utd/src/main/java/org/brailleblaster/utd/actions/XsltAction.kt @@ -160,8 +160,8 @@ open class XsltAction @JvmOverloads constructor(@get:XmlAttribute var table: Bra val prime = 31 var result = super.hashCode() result = prime * result + table.hashCode() - result = prime * result + (xsltResource?.hashCode() ?: 0) - result = prime * result + (xsltUri?.hashCode() ?: 0) + result = prime * result + xsltResource.hashCode() + result = prime * result + xsltUri.hashCode() return result } diff --git a/utd/src/main/java/org/brailleblaster/utd/config/UTDConfig.kt b/utd/src/main/java/org/brailleblaster/utd/config/UTDConfig.kt index 82dcf075..b8537355 100644 --- a/utd/src/main/java/org/brailleblaster/utd/config/UTDConfig.kt +++ b/utd/src/main/java/org/brailleblaster/utd/config/UTDConfig.kt @@ -151,7 +151,6 @@ object UTDConfig { * Utility to load the styleMap and actionMap files with common prefixes and * standard suffixes */ - @JvmStatic fun loadMappings(engine: UTDTranslationEngine, mappingsDir: File, mappingsPrefix: String) { require(mappingsDir.isDirectory) { "$mappingsDir for mappings is not a directory" } require(mappingsPrefix.isNotBlank()) { "Mapping file prefix cannot be blank" } @@ -166,7 +165,6 @@ object UTDConfig { saveActions(File(mappingsDir, "$mappingsPrefix.actionMap.xml"), engine.actionMap) } - @JvmStatic fun loadPageSettings(pageSettingsFile: File): PageSettings { log.debug("Loading Page Settings from file {}", pageSettingsFile) return loadJAXB( @@ -180,7 +178,6 @@ object UTDConfig { saveJAXB(pageSettingsFile, pageSettings, JAXB_CONTEXT_SETTINGS!!) } - @JvmStatic fun loadBrailleSettings(brailleSettingsFile: File): BrailleSettings { log.debug("Loading Braille Settings from file {}", brailleSettingsFile) return loadJAXB( @@ -189,13 +186,11 @@ object UTDConfig { ) } - @JvmStatic fun saveBrailleSettings(brailleSettingsFile: File, brailleSettings: BrailleSettings) { log.debug("Writing Braille Settings to file {}", brailleSettingsFile) saveJAXB(brailleSettingsFile, brailleSettings, JAXB_CONTEXT_SETTINGS!!) } - @JvmStatic fun loadActions(actionsFile: File): ActionMap? { log.debug("Loading ActionMap from file {}", actionsFile) val adapter = ActionMapAdapter() @@ -206,8 +201,7 @@ object UTDConfig { ) ) } - - @JvmStatic + fun saveActions(actionsFile: File, actionMap: IActionMap) { log.debug("Writing ActionMap to file {} - overwriting {}", actionsFile, actionsFile.exists()) require(actionMap is ActionMap) { "Only supports ActionMap, " + "given " + actionMap + " " + actionMap.javaClass } diff --git a/utd/src/main/java/org/brailleblaster/utd/internal/NamespaceMapAdapter.kt b/utd/src/main/java/org/brailleblaster/utd/internal/NamespaceMapAdapter.kt index 6121872d..78084c91 100644 --- a/utd/src/main/java/org/brailleblaster/utd/internal/NamespaceMapAdapter.kt +++ b/utd/src/main/java/org/brailleblaster/utd/internal/NamespaceMapAdapter.kt @@ -33,8 +33,8 @@ class NamespaceMapAdapter : XmlAdapter() { null } else { val result = NamespaceMap() - for (nsDef in namespaces.namespaces) { - result.addNamespace(nsDef.prefix, nsDef.uri) + for ((prefix, uri) in namespaces.namespaces) { + result.addNamespace(prefix, uri) } result } diff --git a/utd/src/main/java/org/brailleblaster/utd/internal/elements/BrlOnly.kt b/utd/src/main/java/org/brailleblaster/utd/internal/elements/BrlOnly.kt index 567357e4..23c032b1 100644 --- a/utd/src/main/java/org/brailleblaster/utd/internal/elements/BrlOnly.kt +++ b/utd/src/main/java/org/brailleblaster/utd/internal/elements/BrlOnly.kt @@ -21,7 +21,6 @@ import org.brailleblaster.utils.xml.UTD_NS class BrlOnly : Element(PROTOTYPE) { companion object { - @JvmStatic private val PROTOTYPE = Element(UTDElements.BRLONLY.qName, UTD_NS) } } \ No newline at end of file diff --git a/utd/src/main/java/org/brailleblaster/utd/internal/elements/Meta.kt b/utd/src/main/java/org/brailleblaster/utd/internal/elements/Meta.kt index 4e2f1cce..bb0d2bdf 100644 --- a/utd/src/main/java/org/brailleblaster/utd/internal/elements/Meta.kt +++ b/utd/src/main/java/org/brailleblaster/utd/internal/elements/Meta.kt @@ -21,7 +21,6 @@ import org.brailleblaster.utils.xml.UTD_NS class Meta : Element(PROTOTYPE) { companion object { - @JvmStatic private val PROTOTYPE = Element(UTDElements.META.qName, UTD_NS) } } \ No newline at end of file diff --git a/utd/src/main/java/org/brailleblaster/utd/internal/elements/Tab.kt b/utd/src/main/java/org/brailleblaster/utd/internal/elements/Tab.kt index 6d79febe..6aeb3231 100644 --- a/utd/src/main/java/org/brailleblaster/utd/internal/elements/Tab.kt +++ b/utd/src/main/java/org/brailleblaster/utd/internal/elements/Tab.kt @@ -34,7 +34,6 @@ class Tab : Element(PROTOTYPE) { } companion object { - @JvmStatic private val PROTOTYPE = Element(UTDElements.TAB.qName, UTD_NS).apply { addAttribute(Attribute("xml:space", "http://www.w3.org/XML/1998/namespace", "preserve")) } } diff --git a/utd/src/main/java/org/brailleblaster/utd/internal/xml/XMLHandler.kt b/utd/src/main/java/org/brailleblaster/utd/internal/xml/XMLHandler.kt index 835e0c12..9fd874ad 100644 --- a/utd/src/main/java/org/brailleblaster/utd/internal/xml/XMLHandler.kt +++ b/utd/src/main/java/org/brailleblaster/utd/internal/xml/XMLHandler.kt @@ -419,7 +419,7 @@ open class XMLHandler { * Lowest Common Ancestor Problem */ fun findCommonParent(elements: List): Element { - require(!elements.isEmpty()) { "elements list cannot be empty" } + require(elements.isNotEmpty()) { "elements list cannot be empty" } for (element in elements) { log.debug("in list {}", element.toXML()) if (element.document == null) { diff --git a/utd/src/main/java/org/brailleblaster/utd/matchers/DelegatingMatcher.kt b/utd/src/main/java/org/brailleblaster/utd/matchers/DelegatingMatcher.kt index c8401edf..f63c462b 100644 --- a/utd/src/main/java/org/brailleblaster/utd/matchers/DelegatingMatcher.kt +++ b/utd/src/main/java/org/brailleblaster/utd/matchers/DelegatingMatcher.kt @@ -22,7 +22,7 @@ abstract class DelegatingMatcher : INodeMatcher { override fun hashCode(): Int { val prime = 31 var result = 1 - result = prime * result + (matcher?.hashCode() ?: 0) + result = prime * result + matcher.hashCode() return result } diff --git a/utd/src/main/java/org/brailleblaster/utd/matchers/ImmediatelyPrecedingStyleMatcher.kt b/utd/src/main/java/org/brailleblaster/utd/matchers/ImmediatelyPrecedingStyleMatcher.kt index 47b51c20..ad7254ae 100644 --- a/utd/src/main/java/org/brailleblaster/utd/matchers/ImmediatelyPrecedingStyleMatcher.kt +++ b/utd/src/main/java/org/brailleblaster/utd/matchers/ImmediatelyPrecedingStyleMatcher.kt @@ -51,7 +51,7 @@ class ImmediatelyPrecedingStyleMatcher : INodeMatcher { override fun hashCode(): Int { val prime = 31 var result = 1 - result = prime * result + (styleMatcher?.hashCode() ?: 0) + result = prime * result + styleMatcher.hashCode() return result } diff --git a/utd/src/main/java/org/brailleblaster/utd/matchers/NodeAncestorDelegatingMatcher.kt b/utd/src/main/java/org/brailleblaster/utd/matchers/NodeAncestorDelegatingMatcher.kt index 47962c8d..726ed2c6 100644 --- a/utd/src/main/java/org/brailleblaster/utd/matchers/NodeAncestorDelegatingMatcher.kt +++ b/utd/src/main/java/org/brailleblaster/utd/matchers/NodeAncestorDelegatingMatcher.kt @@ -84,7 +84,7 @@ class NodeAncestorDelegatingMatcher : DelegatingMatcher() { override fun hashCode(): Int { val prime = 31 var result = super.hashCode() - result = prime * result + (position?.hashCode() ?: 0) + result = prime * result + position.hashCode() return result } diff --git a/utd/src/main/java/org/brailleblaster/utd/matchers/NodeNameMatcher.kt b/utd/src/main/java/org/brailleblaster/utd/matchers/NodeNameMatcher.kt index 97b7ae30..3fb7e7e9 100644 --- a/utd/src/main/java/org/brailleblaster/utd/matchers/NodeNameMatcher.kt +++ b/utd/src/main/java/org/brailleblaster/utd/matchers/NodeNameMatcher.kt @@ -54,9 +54,9 @@ open class NodeNameMatcher @JvmOverloads constructor(nodeName: String? = null, val prime = 31 var result = 1 result = (prime * result - + (namespace?.hashCode() ?: 0)) + + namespace.hashCode()) result = (prime * result - + (nodeName?.hashCode() ?: 0)) + + nodeName.hashCode()) return result } diff --git a/utd/src/main/java/org/brailleblaster/utd/matchers/XPathMatcher.kt b/utd/src/main/java/org/brailleblaster/utd/matchers/XPathMatcher.kt index 85fab2f9..90979b61 100644 --- a/utd/src/main/java/org/brailleblaster/utd/matchers/XPathMatcher.kt +++ b/utd/src/main/java/org/brailleblaster/utd/matchers/XPathMatcher.kt @@ -68,7 +68,7 @@ class XPathMatcher : INodeMatcher { override fun hashCode(): Int { val prime = 31 var result = 1 - result = prime * result + (expression?.hashCode() ?: 0) + result = prime * result + expression.hashCode() return result } diff --git a/utd/src/main/java/org/brailleblaster/utd/properties/EmphasisType.kt b/utd/src/main/java/org/brailleblaster/utd/properties/EmphasisType.kt index f6d1cfc5..01f704d4 100644 --- a/utd/src/main/java/org/brailleblaster/utd/properties/EmphasisType.kt +++ b/utd/src/main/java/org/brailleblaster/utd/properties/EmphasisType.kt @@ -40,7 +40,6 @@ enum class EmphasisType(val jlouisTypeform: Short, val longName: String) { * @param longName * @return EmphasisType for corresponding pretty name, null if not found */ - @JvmStatic fun getEmphasisType(longName: String): EmphasisType? { for (type in entries) { if (type.longName == longName) { diff --git a/utd/src/main/java/org/brailleblaster/utd/properties/PageNumberType.kt b/utd/src/main/java/org/brailleblaster/utd/properties/PageNumberType.kt index ddcac1f5..904d3fd4 100644 --- a/utd/src/main/java/org/brailleblaster/utd/properties/PageNumberType.kt +++ b/utd/src/main/java/org/brailleblaster/utd/properties/PageNumberType.kt @@ -32,13 +32,10 @@ enum class PageNumberType { } companion object { - @JvmStatic - fun equivalentPage(pageType: String?): PageNumberType { - return when (pageType) { - "T_PAGE" -> T_PAGE - "P_PAGE" -> P_PAGE - else -> NORMAL - } + fun equivalentPage(pageType: String?): PageNumberType = when (pageType) { + "T_PAGE" -> T_PAGE + "P_PAGE" -> P_PAGE + else -> NORMAL } } } \ No newline at end of file diff --git a/utd/src/main/java/org/brailleblaster/utd/properties/UTDElements.kt b/utd/src/main/java/org/brailleblaster/utd/properties/UTDElements.kt index 665c155e..41ce8567 100644 --- a/utd/src/main/java/org/brailleblaster/utd/properties/UTDElements.kt +++ b/utd/src/main/java/org/brailleblaster/utd/properties/UTDElements.kt @@ -77,7 +77,6 @@ enum class UTDElements(val elementName: String) { return null } - @JvmStatic fun findType(e: Element): UTDElements? { if (UTD_NS == e.namespaceURI) { for (curType in entries) { diff --git a/utd/src/main/java/org/brailleblaster/utd/tables/ListedTableFormatter.kt b/utd/src/main/java/org/brailleblaster/utd/tables/ListedTableFormatter.kt index c97a2612..18c8608b 100644 --- a/utd/src/main/java/org/brailleblaster/utd/tables/ListedTableFormatter.kt +++ b/utd/src/main/java/org/brailleblaster/utd/tables/ListedTableFormatter.kt @@ -93,9 +93,9 @@ class ListedTableFormatter : Formatter() { if (cells.size <= 1 || headings.isEmpty()) { return LiteraryFormatter().format(node, style, mutPageBuilders, formatSelector) } - for (cell in headings) { + for ((td) in headings) { val colon: Element = TableDivider(TableDivider.DividerTypes.LISTED_COLON) - if (cell.td.value.isEmpty()) { + if (td.value.isEmpty()) { colon.removeChildren() } else { val newBrl = UTDElements.BRL.create() @@ -104,8 +104,8 @@ class ListedTableFormatter : Formatter() { newBrl.appendChild(sepBrl) colon.appendChild(newBrl) } - cell.td.appendChild(colon) - cell.td.detach() + td.appendChild(colon) + td.detach() } TableUtils.findRows(node, formatSelector.styleMap).first().detach() attachHeadings(headings, cells) diff --git a/utd/src/main/java/org/brailleblaster/utd/toc/TOCAttributes.kt b/utd/src/main/java/org/brailleblaster/utd/toc/TOCAttributes.kt index c1876888..a5d5da80 100644 --- a/utd/src/main/java/org/brailleblaster/utd/toc/TOCAttributes.kt +++ b/utd/src/main/java/org/brailleblaster/utd/toc/TOCAttributes.kt @@ -70,7 +70,6 @@ enum class TOCAttributes(@JvmField val origName: String) { for (curChild in elem.childElements) removeAllRecursive(curChild) } - @JvmStatic fun removeAll(elem: Element) { for (curAttrib in entries) { if (curAttrib.inElement(elem)) curAttrib.remove(elem) diff --git a/utd/src/main/java/org/brailleblaster/utd/utils/LocalEntityResolver.kt b/utd/src/main/java/org/brailleblaster/utd/utils/LocalEntityResolver.kt index 65859dd3..98bf442f 100644 --- a/utd/src/main/java/org/brailleblaster/utd/utils/LocalEntityResolver.kt +++ b/utd/src/main/java/org/brailleblaster/utd/utils/LocalEntityResolver.kt @@ -190,8 +190,6 @@ class LocalEntityResolver : EntityResolver2 { } } - @JvmStatic - @JvmOverloads @Throws(SAXException::class, ParserConfigurationException::class) fun createXomBuilder(validate: Boolean = false): Builder { val parser = newNSInstance("org.apache.xerces.jaxp.SAXParserFactoryImpl", null).newSAXParser().xmlReader diff --git a/utd/src/main/java/org/brailleblaster/utd/utils/PageBuilderHelper.kt b/utd/src/main/java/org/brailleblaster/utd/utils/PageBuilderHelper.kt index d31e3c56..d4b75a93 100644 --- a/utd/src/main/java/org/brailleblaster/utd/utils/PageBuilderHelper.kt +++ b/utd/src/main/java/org/brailleblaster/utd/utils/PageBuilderHelper.kt @@ -51,7 +51,6 @@ object PageBuilderHelper { return pages } - @JvmStatic fun isPageIndicator(brl: Element): Boolean { require(UTDElements.BRL.isA(brl)) { "Expected brl, received $brl" } @@ -174,7 +173,6 @@ object PageBuilderHelper { /** * Set the page number type directly. If you're using a pagenum element, use changePageNumberType instead */ - @JvmStatic fun setPageNumberType(pageBuilder: PageBuilder, pageType: PageNumberType, formatSelector: FormatSelector) { //You need to double check here if you are indeed using the correct braille page type for this brl if (pageBuilder.pageNumberTypeFromMetaData != null) { @@ -198,7 +196,6 @@ object PageBuilderHelper { * First verifies if a page indicator can be inserted, and if so, makes a new line if the current line is not * empty and inserts a page indicator */ - @JvmStatic fun handlePageIndicator( pb: PageBuilder, brl: Element, @@ -297,7 +294,6 @@ object PageBuilderHelper { return results } - @JvmStatic fun verifyPageSide(pageBuilder: PageBuilder, side: String) { //Check what side of the document you're on if (side == "right") { @@ -309,7 +305,6 @@ object PageBuilderHelper { } } - @JvmStatic fun isSkipLinesNode(node: Node?): Boolean { return node is Element && node.getAttributeValue( UTDElements.UTD_SKIP_LINES_ATTRIB, @@ -335,7 +330,6 @@ object PageBuilderHelper { return Property.ODD } - @JvmStatic fun getPrintPageNumberAt(pageSettings: PageSettings, braillePageNumber: Int): PageNumberPosition { if (getPageProperty(braillePageNumber) == Property.EVEN) { return pageSettings.evenPrintPageNumberAt @@ -343,7 +337,6 @@ object PageBuilderHelper { return pageSettings.oddPrintPageNumberAt } - @JvmStatic fun getBraillePageNumberAt(pageSettings: PageSettings, braillePageNumber: Int): PageNumberPosition { if (getPageProperty(braillePageNumber) == Property.EVEN) { return pageSettings.evenBraillePageNumberAt diff --git a/utd/src/main/java/org/brailleblaster/utd/utils/TableUtils.kt b/utd/src/main/java/org/brailleblaster/utd/utils/TableUtils.kt index fe9fa3e9..aa9de469 100644 --- a/utd/src/main/java/org/brailleblaster/utd/utils/TableUtils.kt +++ b/utd/src/main/java/org/brailleblaster/utd/utils/TableUtils.kt @@ -38,7 +38,6 @@ object TableUtils { * @param table * @return */ - @JvmStatic fun copyTable(table: Element): Element { val newTable = table.copy() findTableBrls(table).forEach { it.localName = "brl" } @@ -77,7 +76,6 @@ object TableUtils { if (style.isTableCell) listOf(it) else findCols(it, iStyleMap) } - @JvmStatic fun findCaption(element: Element, styleMap: IStyleMap): List { val foundCaption: MutableList = ArrayList() for (i in 0 until element.childCount) { @@ -119,7 +117,6 @@ object TableUtils { } const val SIGN_OF_OMISSION = "\u2013" - @JvmOverloads fun createSignsOfOmission( engine: ITranslationEngine, tableParent: Element, @@ -281,17 +278,16 @@ object TableUtils { } } - @JvmStatic + fun hasSimpleTableOption(option: SimpleTableOptions, table: Element): Boolean { return option.value == table.getAttributeValue(option.id) } - @JvmStatic + fun applySimpleTableOption(table: Element, option: SimpleTableOptions) { table.addAttribute(Attribute(option.id, option.value)) } - @JvmStatic fun getCustomSimpleTableWidths(table: Element): IntArray? { if (hasSimpleTableOption(SimpleTableOptions.CUSTOM_WIDTHS, table)) { val attr = table.getAttributeValue("widths") ?: return null @@ -300,7 +296,6 @@ object TableUtils { return null } - @JvmStatic fun applyCustomSimpleTableWidths(table: Element, widths: IntArray) { applySimpleTableOption(table, SimpleTableOptions.CUSTOM_WIDTHS) table.addAttribute(Attribute("widths", widths.joinToString(separator = ",") { it.toString() })) @@ -311,7 +306,7 @@ object TableUtils { * @param table * @return */ - @JvmStatic + fun isTableCopy(table: Element): Boolean { return table.getAttribute( ATTRIB_TABLE_COPY, diff --git a/utd/src/main/java/org/brailleblaster/utd/utils/TextTranslator.kt b/utd/src/main/java/org/brailleblaster/utd/utils/TextTranslator.kt index 54a27572..a49e74ed 100644 --- a/utd/src/main/java/org/brailleblaster/utd/utils/TextTranslator.kt +++ b/utd/src/main/java/org/brailleblaster/utd/utils/TextTranslator.kt @@ -32,8 +32,6 @@ object TextTranslator { private val log: Logger = LoggerFactory.getLogger(TextTranslator::class.java) - @JvmStatic - @JvmOverloads fun translateText( translateText: String, context: ITranslationEngine, diff --git a/utd/src/main/java/org/brailleblaster/utd/utils/dom/BoxUtils.kt b/utd/src/main/java/org/brailleblaster/utd/utils/dom/BoxUtils.kt index a98b6aa7..7452ab86 100644 --- a/utd/src/main/java/org/brailleblaster/utd/utils/dom/BoxUtils.kt +++ b/utd/src/main/java/org/brailleblaster/utd/utils/dom/BoxUtils.kt @@ -29,8 +29,7 @@ object BoxUtils { * * @param element The element which represents the boxed item (eg. the sidebar element). */ - @JvmStatic - fun stripBoxBrl(element: Element?) { + fun stripBoxBrl(element: Element?) { if (element == null) { return } @@ -101,8 +100,7 @@ object BoxUtils { * * @param element The box element (eg. sidebar). */ - @JvmStatic - fun unbox(element: Element) { + fun unbox(element: Element) { // Check there is a parent, cannot do otherwise val parent = element.parent ?: throw IllegalArgumentException("The element is not attached to a parent.") stripBoxBrl(element) diff --git a/utd/src/test/java/org/brailleblaster/utd/ActionMapTest.java b/utd/src/test/java/org/brailleblaster/utd/ActionMapTest.java index 3cadf674..989b143a 100644 --- a/utd/src/test/java/org/brailleblaster/utd/ActionMapTest.java +++ b/utd/src/test/java/org/brailleblaster/utd/ActionMapTest.java @@ -125,14 +125,14 @@ private Object[][] actionMapDataProvider() { @Test(dataProvider = "actionMapDataProvider") public void saveTest(ActionMap map) throws Exception { File tempOutput = File.createTempFile("actionMap", "test"); - UTDConfig.saveActions(tempOutput, map); + UTDConfig.INSTANCE.saveActions(tempOutput, map); UTDConfigUtils.compareOutputToSaved(tempOutput, UTDConfigUtils.TEST_ACTION_FILE); } @Test(dataProvider = "actionMapDataProvider") public void loadTest(ActionMap mapExpected) throws Exception { //TODO: Only handles ActionMap impl do to get(int) - ActionMap mapLoaded = UTDConfig.loadActions(UTDConfigUtils.TEST_ACTION_FILE); + ActionMap mapLoaded = UTDConfig.INSTANCE.loadActions(UTDConfigUtils.TEST_ACTION_FILE); //Validate action map assertEquals(mapLoaded.size(), mapExpected.size(), "Map sizes are different"); diff --git a/utd/src/test/java/org/brailleblaster/utd/InsertionPatternEntryTest.java b/utd/src/test/java/org/brailleblaster/utd/InsertionPatternEntryTest.java index 992eb9ad..96c13f74 100644 --- a/utd/src/test/java/org/brailleblaster/utd/InsertionPatternEntryTest.java +++ b/utd/src/test/java/org/brailleblaster/utd/InsertionPatternEntryTest.java @@ -51,7 +51,7 @@ public void listToMap() { expected.put("-", "#"); expected.put("0", ";"); expected.put("j", ";"); - Map actual = InsertionPatternEntry.listToMap(listInsertions); + Map actual = InsertionPatternEntry.Companion.listToMap(listInsertions); assertEquals(actual.size(), expected.size()); Iterator> expectedSet = expected.entrySet().iterator(); Iterator> actualSet = actual.entrySet().iterator(); @@ -65,7 +65,7 @@ public void listToMap() { @Test public void listToMapWithNull() { - Map actual = InsertionPatternEntry.listToMap(null); + Map actual = InsertionPatternEntry.Companion.listToMap(null); assertTrue(actual.isEmpty()); } } diff --git a/utd/src/test/java/org/brailleblaster/utd/MetadataHelperTest.java b/utd/src/test/java/org/brailleblaster/utd/MetadataHelperTest.java index 85b2a86e..f3a6fd15 100644 --- a/utd/src/test/java/org/brailleblaster/utd/MetadataHelperTest.java +++ b/utd/src/test/java/org/brailleblaster/utd/MetadataHelperTest.java @@ -48,7 +48,7 @@ public Document nodeBuilder() { @Test(enabled = false) public void addMetaTest() { Document doc = nodeBuilder(); - MetadataHelper.changeBraillePageNumber(doc, "#a", "#b", null, false, true); + MetadataHelper.INSTANCE.changeBraillePageNumber(doc, "#a", "#b", null, false, true); try { Element head = (Element) doc.getChild(0).getChild(0); Element meta = (Element) head.getChild(0); @@ -62,15 +62,15 @@ public void addMetaTest() { @Test(enabled = false) public void testFindPageChange() { Document doc = nodeBuilder(); - assertNull(MetadataHelper.findPrintPageChange(doc.getDocument(), "1")); - MetadataHelper.changePrintPageNumber(doc, "1", "2", null, false); - MetadataHelper.changeBraillePageNumber(doc, "a", "b", null, false, true); + assertNull(MetadataHelper.INSTANCE.findPrintPageChange(doc.getDocument(), "1")); + MetadataHelper.INSTANCE.changePrintPageNumber(doc, "1", "2", null, false); + MetadataHelper.INSTANCE.changeBraillePageNumber(doc, "a", "b", null, false, true); try { Element head = (Element) doc.getChild(0).getChild(0); Element meta1 = (Element) head.getChild(0); Element meta2 = (Element) head.getChild(1); - Element findMeta1 = MetadataHelper.findPrintPageChange(doc.getDocument(), "1"); - Element findMeta2 = MetadataHelper.findBraillePageChange(doc.getDocument(), "a"); + Element findMeta1 = MetadataHelper.INSTANCE.findPrintPageChange(doc.getDocument(), "1"); + Element findMeta2 = MetadataHelper.INSTANCE.findBraillePageChange(doc.getDocument(), "a"); assertNotNull(findMeta1, "Meta tag for Print Page Change not found in document: " + doc.toXML()); assertNotNull(findMeta2, "Meta tag for Braille Page Change not found in document: " + doc.toXML()); assertEquals(meta1.toXML(), findMeta1.toXML(), "Meta tags not equal: " + meta1.toXML() + " || " + findMeta1.toXML()); @@ -83,13 +83,13 @@ public void testFindPageChange() { @Test(enabled = false) public void testAdaptPageChangeWithNew() { Document doc = nodeBuilder(); - assertNull(MetadataHelper.findPrintPageChange(doc.getDocument(), "1")); - MetadataHelper.changePrintPageNumber(doc, "1", "2", null, false); - MetadataHelper.changePrintPageNumber(doc, "2", "3", null, false); + assertNull(MetadataHelper.INSTANCE.findPrintPageChange(doc.getDocument(), "1")); + MetadataHelper.INSTANCE.changePrintPageNumber(doc, "1", "2", null, false); + MetadataHelper.INSTANCE.changePrintPageNumber(doc, "2", "3", null, false); try { - Element findMeta1 = MetadataHelper.findPrintPageChange(doc.getDocument(), "1"); + Element findMeta1 = MetadataHelper.INSTANCE.findPrintPageChange(doc.getDocument(), "1"); assertNotNull(findMeta1, "Meta tag for Print Page Change not found in document: " + doc.toXML()); - assertEquals("3", findMeta1.getAttributeValue("new")); + assertEquals(findMeta1.getAttributeValue("new"), "3"); } catch (ClassCastException | IndexOutOfBoundsException e) { fail("Malformed XML: " + doc.toXML(), e); } @@ -98,13 +98,13 @@ public void testAdaptPageChangeWithNew() { @Test(enabled = false) public void testAdaptPageChangeWithBlank() { Document doc = nodeBuilder(); - assertNull(MetadataHelper.findPrintPageChange(doc.getDocument(), "1")); - MetadataHelper.changePrintPageNumber(doc, "1", "2", null, false); - MetadataHelper.markBlankPrintPageNumber(doc, "2", null, false); + assertNull(MetadataHelper.INSTANCE.findPrintPageChange(doc.getDocument(), "1")); + MetadataHelper.INSTANCE.changePrintPageNumber(doc, "1", "2", null, false); + MetadataHelper.INSTANCE.markBlankPrintPageNumber(doc, "2", null, false); try { - Element findMeta1 = MetadataHelper.findPrintPageChange(doc.getDocument(), "1"); + Element findMeta1 = MetadataHelper.INSTANCE.findPrintPageChange(doc.getDocument(), "1"); assertNotNull(findMeta1, "Meta tag for Print Page Change not found in document: " + doc.toXML()); - assertEquals("true", findMeta1.getAttributeValue("blank")); + assertEquals(findMeta1.getAttributeValue("blank"), "true"); } catch (ClassCastException | IndexOutOfBoundsException e) { fail("Malformed XML: " + doc.toXML(), e); } @@ -113,15 +113,15 @@ public void testAdaptPageChangeWithBlank() { @Test(enabled = false) public void testAdaptPageChangeWithPageTypeNewAndCL() { Document doc = nodeBuilder(); - assertNull(MetadataHelper.findPrintPageChange(doc.getDocument(), "1")); - MetadataHelper.changePrintPageNumber(doc, "1", "2", null, false); - MetadataHelper.changePrintPageNumber(doc, "2", "3", "a", "P_PAGE", null, false); + assertNull(MetadataHelper.INSTANCE.findPrintPageChange(doc.getDocument(), "1")); + MetadataHelper.INSTANCE.changePrintPageNumber(doc, "1", "2", null, false); + MetadataHelper.INSTANCE.changePrintPageNumber(doc, "2", "3", "a", "P_PAGE", null, false); try { - Element findMeta1 = MetadataHelper.findPrintPageChange(doc.getDocument(), "1"); + Element findMeta1 = MetadataHelper.INSTANCE.findPrintPageChange(doc.getDocument(), "1"); assertNotNull(findMeta1, "Meta tag for Print Page Change not found in document: " + doc.toXML()); - assertEquals("3", findMeta1.getAttributeValue("new")); - assertEquals("a", findMeta1.getAttributeValue("cl")); - assertEquals("P_PAGE", findMeta1.getAttributeValue("pageType")); + assertEquals(findMeta1.getAttributeValue("new"), "3"); + assertEquals(findMeta1.getAttributeValue("cl"), "a"); + assertEquals(findMeta1.getAttributeValue("pageType"), "P_PAGE"); } catch (ClassCastException | IndexOutOfBoundsException e) { fail("Malformed XML: " + doc.toXML(), e); } @@ -130,13 +130,13 @@ public void testAdaptPageChangeWithPageTypeNewAndCL() { @Test(enabled = false) public void testAdaptPageChangeWithBraillePage() { Document doc = nodeBuilder(); - assertNull(MetadataHelper.findPrintPageChange(doc.getDocument(), "1")); - MetadataHelper.changeBraillePageNumber(doc, "1", "2", null, false, true); - MetadataHelper.changeBraillePageNumber(doc, "2", "3", null, false, true); + assertNull(MetadataHelper.INSTANCE.findPrintPageChange(doc.getDocument(), "1")); + MetadataHelper.INSTANCE.changeBraillePageNumber(doc, "1", "2", null, false, true); + MetadataHelper.INSTANCE.changeBraillePageNumber(doc, "2", "3", null, false, true); try { - Element findMeta1 = MetadataHelper.findBraillePageChange(doc.getDocument(), "1"); + Element findMeta1 = MetadataHelper.INSTANCE.findBraillePageChange(doc.getDocument(), "1"); assertNotNull(findMeta1, "Meta tag for Braille Page Change not found in document: " + doc.toXML()); - assertEquals("3", findMeta1.getAttributeValue("new")); + assertEquals(findMeta1.getAttributeValue("new"), "3"); } catch (ClassCastException | IndexOutOfBoundsException e) { fail("Malformed XML: " + doc.toXML(), e); } @@ -145,13 +145,13 @@ public void testAdaptPageChangeWithBraillePage() { @Test(enabled = false) public void testAdaptPageChangeWithBraillePageRunningHead() { Document doc = nodeBuilder(); - assertNull(MetadataHelper.findPrintPageChange(doc.getDocument(), "1")); - MetadataHelper.changeBraillePageNumber(doc, "1", "2", null, false, false); - MetadataHelper.changeBraillePageNumber(doc, "2", "3", null, false, true); + assertNull(MetadataHelper.INSTANCE.findPrintPageChange(doc.getDocument(), "1")); + MetadataHelper.INSTANCE.changeBraillePageNumber(doc, "1", "2", null, false, false); + MetadataHelper.INSTANCE.changeBraillePageNumber(doc, "2", "3", null, false, true); try { - Element findMeta1 = MetadataHelper.findBraillePageChange(doc.getDocument(), "1"); + Element findMeta1 = MetadataHelper.INSTANCE.findBraillePageChange(doc.getDocument(), "1"); assertNotNull(findMeta1, "Meta tag for Braille Page Change not found in document: " + doc.toXML()); - assertEquals("3", findMeta1.getAttributeValue("new")); + assertEquals(findMeta1.getAttributeValue("new"), "3"); assertNull(findMeta1.getAttribute("runHead")); } catch (ClassCastException | IndexOutOfBoundsException e) { fail("Malformed XML: " + doc.toXML(), e); @@ -161,20 +161,20 @@ public void testAdaptPageChangeWithBraillePageRunningHead() { @Test(enabled = false) public void testRunningHeadWithBraillePage() { Document doc = nodeBuilder(); - assertNull(MetadataHelper.findPrintPageChange(doc.getDocument(), "1")); - MetadataHelper.changeBraillePageNumber(doc, "1", "2", null, false, false); + assertNull(MetadataHelper.INSTANCE.findPrintPageChange(doc.getDocument(), "1")); + MetadataHelper.INSTANCE.changeBraillePageNumber(doc, "1", "2", null, false, false); try { - Element findMeta1 = MetadataHelper.findBraillePageChange(doc.getDocument(), "1"); + Element findMeta1 = MetadataHelper.INSTANCE.findBraillePageChange(doc.getDocument(), "1"); assertNotNull(findMeta1, "Meta tag for Braille Page Change not found in document: " + doc.toXML()); - assertEquals("false", findMeta1.getAttributeValue("runHead")); + assertEquals(findMeta1.getAttributeValue("runHead"), "false"); } catch (ClassCastException | IndexOutOfBoundsException e) { fail("Malformed XML: " + doc.toXML(), e); } - MetadataHelper.changeBraillePageNumber(doc, "1", "2", null, false, true); + MetadataHelper.INSTANCE.changeBraillePageNumber(doc, "1", "2", null, false, true); try { - Element findMeta1 = MetadataHelper.findBraillePageChange(doc.getDocument(), "1"); + Element findMeta1 = MetadataHelper.INSTANCE.findBraillePageChange(doc.getDocument(), "1"); assertNotNull(findMeta1, "Meta tag for Braille Page Change not found in document: " + doc.toXML()); assertNull(findMeta1.getAttribute("runHead")); } catch (ClassCastException | IndexOutOfBoundsException e) { diff --git a/utd/src/test/java/org/brailleblaster/utd/formatting/StyleOptionTest.java b/utd/src/test/java/org/brailleblaster/utd/formatting/StyleOptionTest.java index 2be488c9..50c0ed0e 100644 --- a/utd/src/test/java/org/brailleblaster/utd/formatting/StyleOptionTest.java +++ b/utd/src/test/java/org/brailleblaster/utd/formatting/StyleOptionTest.java @@ -141,7 +141,7 @@ public void colorBoxlineTest(){ ""); UTDTranslationEngine engine = UTDTestUtils.translateAndFormat(doc); new UTDDocumentAsserter(doc, engine) - .hasTextAt(TransNoteAction.getStart("ueb")+"blue"+TransNoteAction.getEnd("ueb")+" 77777777777777777777777777777", 0, 1) + .hasTextAt(TransNoteAction.Companion.getStart("ueb")+"blue"+TransNoteAction.Companion.getEnd("ueb")+" 77777777777777777777777777777", 0, 1) .hasTextAt("Test", 0, 2) .hasTextAt("gggggggggggggggggggggggggggggggggggggggg", 0, 3) .hasNoOtherMoveTo(); diff --git a/utd/src/test/java/org/brailleblaster/utd/utils/TextTranslatorTest.java b/utd/src/test/java/org/brailleblaster/utd/utils/TextTranslatorTest.java index 7f1c43ed..fb6f63fa 100644 --- a/utd/src/test/java/org/brailleblaster/utd/utils/TextTranslatorTest.java +++ b/utd/src/test/java/org/brailleblaster/utd/utils/TextTranslatorTest.java @@ -20,6 +20,7 @@ import java.util.Arrays; import org.brailleblaster.utd.ITranslationEngine; +import org.brailleblaster.utd.properties.BrailleTableType; import org.brailleblaster.utd.testutils.MockTranslatorFactory; import org.mwhapples.jlouis.TranslationException; import org.mwhapples.jlouis.Louis.TypeForms; @@ -36,7 +37,7 @@ public void testTranslateString() throws TranslationException { Arrays.fill(typeForms, TypeForms.PLAIN_TEXT); ITranslationEngine contextMock = MockTranslatorFactory.createTranslationEngine(str, brlStr, index, indexOut, typeForms); - String result = TextTranslator.translateText(str, contextMock); + String result = TextTranslator.INSTANCE.translateText(str, contextMock, TypeForms.PLAIN_TEXT, BrailleTableType.LITERARY); assertEquals(result, brlStr); } diff --git a/utils/src/main/kotlin/org/brailleblaster/utils/LengthUtils.kt b/utils/src/main/kotlin/org/brailleblaster/utils/LengthUtils.kt index e3e06d0f..719bc487 100644 --- a/utils/src/main/kotlin/org/brailleblaster/utils/LengthUtils.kt +++ b/utils/src/main/kotlin/org/brailleblaster/utils/LengthUtils.kt @@ -20,24 +20,20 @@ import java.math.RoundingMode import kotlin.math.roundToInt object LengthUtils { - @JvmStatic fun inchesToMM(inches: Double): Double { val denominator = 0.039370 return (inches / denominator * 10.0).roundToInt() / 10.0 } - @JvmStatic fun mmToInches(mm: Double): Double { val multiplier = 0.039370 return (mm * multiplier * 10000.0).roundToInt() / 10000.0 } - @JvmStatic fun toLengthBigDecimal(length: Double): BigDecimal { return BigDecimal(length).setScale(2, RoundingMode.HALF_UP) } - @JvmStatic fun toLengthBigDecimal(length: String?): BigDecimal { return BigDecimal(length).setScale(2, RoundingMode.HALF_UP) } diff --git a/utils/src/main/kotlin/org/brailleblaster/utils/MoreFileUtils.kt b/utils/src/main/kotlin/org/brailleblaster/utils/MoreFileUtils.kt index 0d511719..30197301 100644 --- a/utils/src/main/kotlin/org/brailleblaster/utils/MoreFileUtils.kt +++ b/utils/src/main/kotlin/org/brailleblaster/utils/MoreFileUtils.kt @@ -31,7 +31,6 @@ object MoreFileUtils { * * @return */ - @JvmStatic @Throws(FileNotFoundException::class) fun newReaderUTF8(file: File): BufferedReader { return BufferedReader( @@ -39,7 +38,6 @@ object MoreFileUtils { ) } - @JvmStatic @Throws(FileNotFoundException::class) fun newWriterUTF8(filename: String): BufferedWriter { return BufferedWriter( @@ -56,7 +54,6 @@ object MoreFileUtils { * @param suffix * @return */ - @JvmStatic fun newFileIncrimented(dir: File, prefix: String, suffix: String): File { require(dir.exists()) { "Given directory doesn't exist: " + dir.absolutePath } require(dir.isDirectory) { "Expected directory, given file: " + dir.absolutePath } diff --git a/utils/src/main/kotlin/org/brailleblaster/utils/UnitConverter.kt b/utils/src/main/kotlin/org/brailleblaster/utils/UnitConverter.kt index 74d18d3f..86e5e1be 100644 --- a/utils/src/main/kotlin/org/brailleblaster/utils/UnitConverter.kt +++ b/utils/src/main/kotlin/org/brailleblaster/utils/UnitConverter.kt @@ -64,7 +64,6 @@ class UnitConverter @JvmOverloads constructor(val isMetric: Boolean = Locale.get * @param usFormattedPattern * @return */ - @JvmStatic fun newDecimalFormatUS(usFormattedPattern: String?): DecimalFormat { return DecimalFormat(usFormattedPattern, DecimalFormatSymbols(Locale.ENGLISH)) }