refactor(linter): fix linter issues

xetra11 · Dec 16, 2020 · cc0308f · cc0308f
1 parent 998bef2
commit cc0308f
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 21 deletions.
diff --git a/...tlin/com/github/xetra11/ck3workbench/module/character/importer/CharacterScriptImporter.kt b/...tlin/com/github/xetra11/ck3workbench/module/character/importer/CharacterScriptImporter.kt
@@ -2,7 +2,6 @@ package com.github.xetra11.ck3workbench.module.character.importer
 
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.snapshots.SnapshotStateList
-import com.github.xetra11.ck3workbench.ScriptValidator
 import com.github.xetra11.ck3workbench.module.character.Character
 import com.github.xetra11.ck3workbench.module.character.importer.CharacterScriptImporter.Companion.LOG
 import org.slf4j.Logger

diff --git a/src/main/kotlin/com/github/xetra11/ck3workbench/module/character/importer/ScriptValidator.kt b/src/main/kotlin/com/github/xetra11/ck3workbench/module/character/importer/ScriptValidator.kt
@@ -1,7 +1,7 @@
 package com.github.xetra11.ck3workbench.module.character.importer
 
-import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarValidator
 import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarParser
+import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarValidator
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.io.File

diff --git a/...tlin/com/github/xetra11/ck3workbench/module/character/importer/tokenizer/GrammarNester.kt b/...tlin/com/github/xetra11/ck3workbench/module/character/importer/tokenizer/GrammarNester.kt
@@ -1,9 +1,9 @@
 package com.github.xetra11.ck3workbench.module.character.importer.tokenizer
 
+import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarNester.NestedGrammar
 import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarValidator.OptionalTokenType
 import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarValidator.TokenDefinition
 import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarValidator.TokenType
-import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarNester.NestedGrammar
 
 /**
  * Takes a [List] of [GrammarParser.Grammar] and converts it into [NestedGrammar]

diff --git a/src/main/kotlin/com/github/xetra11/ck3workbench/module/character/view/CharacterModuleView.kt b/src/main/kotlin/com/github/xetra11/ck3workbench/module/character/view/CharacterModuleView.kt
@@ -1,14 +1,8 @@
 package com.github.xetra11.ck3workbench.module.character.view
 
-import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.snapshots.SnapshotStateList
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.dp
 import com.github.xetra11.ck3workbench.module.character.Character
 import com.github.xetra11.ck3workbench.module.character.ui.CharacterList
 import org.slf4j.Logger

diff --git a/src/main/kotlin/main.kt b/src/main/kotlin/main.kt
@@ -1,20 +1,15 @@
 import androidx.compose.desktop.AppManager
 import androidx.compose.desktop.AppWindow
-import androidx.compose.desktop.WindowEvents
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.preferredHeight
-import androidx.compose.foundation.layout.preferredSize
 import androidx.compose.foundation.layout.preferredWidth
 import androidx.compose.foundation.shape.CutCornerShape
 import androidx.compose.material.Button
@@ -40,8 +35,6 @@ import com.github.xetra11.ck3workbench.ScriptValidator.ValidationError
 import com.github.xetra11.ck3workbench.module.character.Character
 import com.github.xetra11.ck3workbench.module.character.CharacterTemplate
 import com.github.xetra11.ck3workbench.module.character.importer.CharacterScriptImporter
-import com.github.xetra11.ck3workbench.module.character.importer.CharacterScriptReader
-import com.github.xetra11.ck3workbench.module.character.importer.ScriptValidatorFactory
 import com.github.xetra11.ck3workbench.module.character.view.CharacterModuleView
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
@@ -95,7 +88,6 @@ fun main() = invokeLater {
             Row(modifier = Modifier.fillMaxSize()) {
                 val widthBlack = percWindowWidth(windowSize.value.width, 20)
                 Box(Modifier.border(5.dp, Color.Black).preferredWidth(widthBlack.dp).fillMaxHeight()) {
-
                 }
                 Box(Modifier.border(5.dp, Color.Red).fillMaxSize()) {
                     CharacterModuleView(characterState)

diff --git a/...t/kotlin/com/github/xetra11/ck3workbench/module/character/importer/ScriptValidatorTest.kt b/...t/kotlin/com/github/xetra11/ck3workbench/module/character/importer/ScriptValidatorTest.kt
@@ -1,12 +1,12 @@
 package com.github.xetra11.ck3workbench.module.character.importer
 
+import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarParser
+import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarParser.Grammar
 import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarValidator
 import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarValidator.GrammarValidation
 import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarValidator.TokenType.ASSIGNMENT
 import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarValidator.TokenType.BLOCK_START
 import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarValidator.TokenType.OBJECT_ID
-import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarParser
-import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarParser.Grammar
 import com.nhaarman.mockitokotlin2.given
 import com.nhaarman.mockitokotlin2.mock
 import org.assertj.core.api.Assertions.assertThat

diff --git a/.../com/github/xetra11/ck3workbench/module/character/importer/tokenizer/GrammarParserTest.kt b/.../com/github/xetra11/ck3workbench/module/character/importer/tokenizer/GrammarParserTest.kt
@@ -1,8 +1,8 @@
 package com.github.xetra11.ck3workbench.module.character.importer.tokenizer
 
+import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarParser.Grammar
 import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarValidator.OptionalTokenType
 import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarValidator.TokenType
-import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarParser.Grammar
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 

diff --git a/...m/github/xetra11/ck3workbench/module/character/importer/tokenizer/GrammarValidatorTest.kt b/...m/github/xetra11/ck3workbench/module/character/importer/tokenizer/GrammarValidatorTest.kt
@@ -1,13 +1,13 @@
 package com.github.xetra11.ck3workbench.module.character.importer.tokenizer
 
+import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarParser.Grammar
 import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarValidator.OptionalTokenType
 import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarValidator.TokenType.ASSIGNMENT
 import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarValidator.TokenType.ATTRIBUTE_ID
 import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarValidator.TokenType.ATTRIBUTE_VALUE
 import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarValidator.TokenType.BLOCK_END
 import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarValidator.TokenType.BLOCK_START
 import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarValidator.TokenType.OBJECT_ID
-import com.github.xetra11.ck3workbench.module.character.importer.tokenizer.GrammarParser.Grammar
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test