Skip to content

Tech/3990/clean tools module #4005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 30 commits into from
Apr 2, 2025
Merged

Tech/3990/clean tools module #4005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
7421fe6
docs(analysis): add ADR (#3990)
BenediktMehl Mar 21, 2025
c701323
docs(analysis): write ADR (#3990)
BenediktMehl Mar 21, 2025
e797773
docs(analysis): accept ADR (#3990)
BenediktMehl Mar 24, 2025
e7262da
docs(analysis): remove MG from ADR (#3990)
BenediktMehl Mar 25, 2025
16ad52c
refactor(analysis): move tools (#3990)
Mar 28, 2025
36bdcb6
test(analysis): fix unit test (#3990)
Mar 28, 2025
28da2a8
test(analysis): fix unit test (#3990)
Mar 28, 2025
860a69e
refactor(analysis): move export (#3990)
Mar 28, 2025
9f82c71
refactor(analysis): rename exporters (#3990)
Mar 28, 2025
381ad9c
refactor(analysis): rename analysers.tools package (#3990)
Mar 28, 2025
9e13018
refactor(analysis): remove redundant qualifiers (#3990)
Mar 28, 2025
c4764c1
refactor(analysis): move filter (#3990)
Mar 28, 2025
d41dbfc
refactor(analysis): remove redundant companion reference (#3990)
Mar 28, 2025
1a2669e
refactor(analysis): rename filters (#3990)
Mar 28, 2025
751bec9
refactor(analysis): move import (#3990)
Mar 28, 2025
cccec02
refactor(analysis): rename importer (#3990)
Mar 31, 2025
edcfd36
refactor(analysis): move parser (#3990)
Mar 31, 2025
17ff916
refactor(analysis): rename parsers (#3990)
Mar 31, 2025
d0cb2a5
refactor(analysis): move InteractiveParser (#3990)
Apr 1, 2025
ef71111
refactor(analysis): rename AnalyserInterface (#3990)
Apr 1, 2025
bbe2a9f
refactor(analysis): move PipeableParser (#3990)
Nereboss Apr 1, 2025
e452f88
refactor(analysis): rename PipeableAnalyserInterface (#3990)
Nereboss Apr 1, 2025
6953b9f
refactor(analysis): move Inquirer (#3990)
Nereboss Apr 1, 2025
4d131e7
refactor(analysis): move ccsh (#3990)
Nereboss Apr 1, 2025
8562fe0
refactor(analysis): move DialogProvider (previously Inquirer) (#3990)
Nereboss Apr 1, 2025
0622392
refactor(analysis): rename DialogProvider (previously Inquirer) (#3990)
Nereboss Apr 1, 2025
e324400
refactor(analysis): update ADR (#3990)
Nereboss Apr 1, 2025
3763391
refactor(analysis): fix typo (#3990)
Nereboss Apr 1, 2025
49dcaa3
refactor(analysis): change name from one function to not include unne…
Nereboss Apr 2, 2025
9ef72cd
refactor(analysis): fix failing tests (#3990)
Nereboss Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
0 .../tools/InteractiveParser/build.gradle.kts → ...lysers/AnalyserInterface/build.gradle.kts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...nteractiveparser/ParserDialogInterface.kt → ...lyserinterface/AnalyserDialogInterface.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.maibornwolff.codecharta.tools.interactiveparser
package de.maibornwolff.codecharta.analysers.analyserinterface

import com.varabyte.kotter.foundation.session
import com.varabyte.kotter.runtime.Session
Expand Down
4 changes: 2 additions & 2 deletions ...ls/interactiveparser/InteractiveParser.kt → ...rs/analyserinterface/AnalyserInterface.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package de.maibornwolff.codecharta.tools.interactiveparser
package de.maibornwolff.codecharta.analysers.analyserinterface

interface InteractiveParser {
interface AnalyserInterface {
val name: String
val description: String

Expand Down
2 changes: 1 addition & 1 deletion ...ractiveparser/util/CodeChartaConstants.kt → ...yserinterface/util/CodeChartaConstants.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.maibornwolff.codecharta.tools.interactiveparser.util
package de.maibornwolff.codecharta.analysers.analyserinterface.util

class CodeChartaConstants {
object General {
Expand Down
7 changes: 7 additions & 0 deletions .../maibornwolff/codecharta/analysers/pipeableanalyserinterface/PipeableAnalyserInterface.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package de.maibornwolff.codecharta.analysers.pipeableanalyserinterface

interface PipeableAnalyserInterface {
fun logPipeableAnalyserSyncSignal(syncSignal: PipeableAnalyserSyncFlag) {
print(syncSignal.value)
}
}
5 changes: 5 additions & 0 deletions ...e/maibornwolff/codecharta/analysers/pipeableanalyserinterface/PipeableAnalyserSyncFlag.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package de.maibornwolff.codecharta.analysers.pipeableanalyserinterface

enum class PipeableAnalyserSyncFlag(val value: String) {
SYNC_FLAG("\u000E\u000E\u000E\u000E\u000E\u000E\u000E\u000E\u000E\u000E\u000E\u000E")
}
0 analysis/export/CSVExporter/README.md → ...analysers/exporters/CSVExporter/README.md
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions analysis/export/CSVExporter/build.gradle.kts → ...rs/exporters/CSVExporter/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dependencies {
implementation(project(":model"))
implementation(project(":tools:Inquirer"))
implementation(project(":tools:InteractiveParser"))
implementation(project(":dialogProvider"))
implementation(project(":analysers:AnalyserInterface"))

implementation(libs.boon)
implementation(libs.slf4j.simple)
Expand Down
10 changes: 5 additions & 5 deletions ...ff/codecharta/exporter/csv/CSVExporter.kt → ...ta/analysers/exporters/csv/CSVExporter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package de.maibornwolff.codecharta.exporter.csv
package de.maibornwolff.codecharta.analysers.exporters.csv

import com.univocity.parsers.csv.CsvWriter
import com.univocity.parsers.csv.CsvWriterSettings
import de.maibornwolff.codecharta.analysers.analyserinterface.AnalyserInterface
import de.maibornwolff.codecharta.analysers.analyserinterface.ParserDialogInterface
import de.maibornwolff.codecharta.analysers.analyserinterface.util.CodeChartaConstants
import de.maibornwolff.codecharta.model.Node
import de.maibornwolff.codecharta.model.Path
import de.maibornwolff.codecharta.model.Project
import de.maibornwolff.codecharta.serialization.FileExtension
import de.maibornwolff.codecharta.serialization.OutputFileHandler
import de.maibornwolff.codecharta.serialization.ProjectDeserializer
import de.maibornwolff.codecharta.tools.interactiveparser.InteractiveParser
import de.maibornwolff.codecharta.tools.interactiveparser.ParserDialogInterface
import de.maibornwolff.codecharta.tools.interactiveparser.util.CodeChartaConstants
import de.maibornwolff.codecharta.util.InputHelper
import de.maibornwolff.codecharta.util.Logger
import picocli.CommandLine
Expand All @@ -27,7 +27,7 @@ import java.util.concurrent.Callable
description = [CSVExporter.DESCRIPTION],
footer = [CodeChartaConstants.General.GENERIC_FOOTER]
)
class CSVExporter() : Callable<Unit>, InteractiveParser {
class CSVExporter() : Callable<Unit>, AnalyserInterface {
@CommandLine.Option(names = ["-h", "--help"], usageHelp = true, description = ["displays this help and exits"])
private var help = false

Expand Down
13 changes: 7 additions & 6 deletions ...f/codecharta/exporter/csv/ParserDialog.kt → ...a/analysers/exporters/csv/ParserDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
package de.maibornwolff.codecharta.exporter.csv
package de.maibornwolff.codecharta.analysers.exporters.csv

import com.varabyte.kotter.runtime.RunScope
import com.varabyte.kotter.runtime.Session
import de.maibornwolff.codecharta.analysers.analyserinterface.ParserDialogInterface
import de.maibornwolff.codecharta.dialogProvider.InputType
import de.maibornwolff.codecharta.dialogProvider.myPromptDefaultFileFolderInput
import de.maibornwolff.codecharta.dialogProvider.myPromptInput
import de.maibornwolff.codecharta.dialogProvider.myPromptInputNumber
import de.maibornwolff.codecharta.serialization.FileExtension
import de.maibornwolff.codecharta.tools.inquirer.myPromptDefaultFileFolderInput
import de.maibornwolff.codecharta.tools.inquirer.myPromptInput
import de.maibornwolff.codecharta.tools.inquirer.myPromptInputNumber
import de.maibornwolff.codecharta.tools.interactiveparser.ParserDialogInterface

class ParserDialog {
companion object : ParserDialogInterface {
override fun collectParserArgs(session: Session): List<String> {
val inputFileName: String = session.myPromptDefaultFileFolderInput(
inputType = de.maibornwolff.codecharta.tools.inquirer.InputType.FOLDER_AND_FILE,
inputType = InputType.FOLDER_AND_FILE,
fileExtensionList = listOf(FileExtension.CCJSON, FileExtension.CCGZ),
onInputReady = testCallback()
)
Expand Down
14 changes: 7 additions & 7 deletions ...a/exporter/csvexporter/CSVExporterTest.kt → .../exporters/csvexporter/CSVExporterTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package de.maibornwolff.codecharta.exporter.csvexporter
package de.maibornwolff.codecharta.analysers.exporters.csvexporter

import de.maibornwolff.codecharta.exporter.csv.CSVExporter
import de.maibornwolff.codecharta.analysers.exporters.csv.CSVExporter
import de.maibornwolff.codecharta.util.InputHelper
import de.maibornwolff.codecharta.util.Logger
import io.mockk.every
Expand Down Expand Up @@ -211,7 +211,7 @@ class CSVExporterTest {
@Test
fun `should write output to stdout when no output file specified`() {
// given
val inputFilePath = "../../test/data/codecharta/csvexport_input.cc.json"
val inputFilePath = "../../../test/data/codecharta/csvexport_input.cc.json"
System.setOut(PrintStream(outContent))

// when
Expand Down Expand Up @@ -246,7 +246,7 @@ class CSVExporterTest {
@Test
fun `should create correct output when depth-of-hierarchy is five`() {
// given
val filePath = "../../test/data/codecharta/csvexport_input.cc.json"
val filePath = "../../../test/data/codecharta/csvexport_input.cc.json"
val maxHierarchy = 5
val dirsZeroToFour = "dir0,dir1,dir2,dir3,dir4"
val dirsFiveToNine = "dir[5-9]"
Expand All @@ -267,7 +267,7 @@ class CSVExporterTest {

@Test
fun `should create correct output when depth-of-hierarchy is zero`() { // given
val filePath = "../../test/data/codecharta/csvexport_input.cc.json"
val filePath = "../../../test/data/codecharta/csvexport_input.cc.json"
val maxHierarchy = 0
System.setOut(PrintStream(outContent))

Expand All @@ -285,7 +285,7 @@ class CSVExporterTest {

@Test
fun `should fail to create output when depth-of-hierarchy is negative`() { // given
val filePath = "../../test/data/codecharta/csvexport_input.cc.json"
val filePath = "../../../test/data/codecharta/csvexport_input.cc.json"
val maxHierarchy = -1
System.setErr(PrintStream(errContent))

Expand All @@ -301,7 +301,7 @@ class CSVExporterTest {

@Test
fun `should log the correct absolute path when output file is specified`() { // given
val inputFilePath = "../../test/data/codecharta/csvexport_input.cc.json"
val inputFilePath = "../../../test/data/codecharta/csvexport_input.cc.json"
val outputFilePath = "src/test/resources/output.csv"
val absoluteOutputFilePath = File(outputFilePath).absolutePath
val outputFile = File(outputFilePath)
Expand Down
8 changes: 4 additions & 4 deletions .../exporter/csvexporter/ParserDialogTest.kt → ...exporters/csvexporter/ParserDialogTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package de.maibornwolff.codecharta.exporter.csvexporter
package de.maibornwolff.codecharta.analysers.exporters.csvexporter

import com.varabyte.kotter.foundation.input.Keys
import com.varabyte.kotter.runtime.RunScope
import com.varabyte.kotter.runtime.terminal.inmemory.press
import com.varabyte.kotter.runtime.terminal.inmemory.type
import com.varabyte.kotterx.test.foundation.testSession
import de.maibornwolff.codecharta.exporter.csv.CSVExporter
import de.maibornwolff.codecharta.exporter.csv.ParserDialog
import de.maibornwolff.codecharta.exporter.csv.ParserDialog.Companion.collectParserArgs
import de.maibornwolff.codecharta.analysers.exporters.csv.CSVExporter
import de.maibornwolff.codecharta.analysers.exporters.csv.ParserDialog
import de.maibornwolff.codecharta.analysers.exporters.csv.ParserDialog.Companion.collectParserArgs
import io.mockk.every
import io.mockk.mockkObject
import org.assertj.core.api.Assertions.assertThat
Expand Down
0 .../src/test/resources/input_valid_1.cc.json → .../src/test/resources/input_valid_1.cc.json
View file
Open in desktop
File renamed without changes.
0 .../src/test/resources/input_valid_2.cc.json → .../src/test/resources/input_valid_2.cc.json
View file
Open in desktop
File renamed without changes.
0 .../src/test/resources/reference_valid_1.csv → .../src/test/resources/reference_valid_1.csv
View file
Open in desktop
File renamed without changes.
0 ...t/resources/reference_valid_1_valid_2.csv → ...t/resources/reference_valid_1_valid_2.csv
View file
Open in desktop
File renamed without changes.
0 ...test/resources/reference_valid_folder.csv → ...test/resources/reference_valid_folder.csv
View file
Open in desktop
File renamed without changes.
0 .../reference_valid_two_files_and_folder.csv → .../reference_valid_two_files_and_folder.csv
View file
Open in desktop
File renamed without changes.
0 analysis/filter/EdgeFilter/README.md → ...is/analysers/filters/EdgeFilter/README.md
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions analysis/filter/EdgeFilter/build.gradle.kts → ...ysers/filters/EdgeFilter/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dependencies {
implementation(project(":model"))
implementation(project(":tools:InteractiveParser"))
implementation(project(":tools:Inquirer"))
implementation(project(":analysers:AnalyserInterface"))
implementation(project(":dialogProvider"))

implementation(libs.univocity.parsers)
implementation(libs.picocli)
Expand Down
10 changes: 5 additions & 5 deletions ...odecharta/filter/edgefilter/EdgeFilter.kt → ...odecharta/filter/edgefilter/EdgeFilter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package de.maibornwolff.codecharta.filter.edgefilter
package de.maibornwolff.codecharta.analysers.filters.edgefilter

import de.maibornwolff.codecharta.analysers.analyserinterface.AnalyserInterface
import de.maibornwolff.codecharta.analysers.analyserinterface.ParserDialogInterface
import de.maibornwolff.codecharta.analysers.analyserinterface.util.CodeChartaConstants
import de.maibornwolff.codecharta.serialization.ProjectDeserializer
import de.maibornwolff.codecharta.serialization.ProjectSerializer
import de.maibornwolff.codecharta.tools.interactiveparser.InteractiveParser
import de.maibornwolff.codecharta.tools.interactiveparser.ParserDialogInterface
import de.maibornwolff.codecharta.tools.interactiveparser.util.CodeChartaConstants
import de.maibornwolff.codecharta.util.InputHelper
import picocli.CommandLine
import java.io.File
Expand All @@ -18,7 +18,7 @@ import java.util.concurrent.Callable
)
class EdgeFilter(
private val output: PrintStream = System.out
) : Callable<Unit?>, InteractiveParser {
) : Callable<Unit?>, AnalyserInterface {
@CommandLine.Option(names = ["-h", "--help"], usageHelp = true, description = ["displays this help and exits"])
var help: Boolean = false

Expand Down
2 changes: 1 addition & 1 deletion ...a/filter/edgefilter/EdgeProjectBuilder.kt → ...a/filter/edgefilter/EdgeProjectBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.maibornwolff.codecharta.filter.edgefilter
package de.maibornwolff.codecharta.analysers.filters.edgefilter

import de.maibornwolff.codecharta.model.AttributeDescriptor
import de.maibornwolff.codecharta.model.AttributeType
Expand Down
10 changes: 5 additions & 5 deletions ...echarta/filter/edgefilter/ParserDialog.kt → ...echarta/filter/edgefilter/ParserDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package de.maibornwolff.codecharta.filter.edgefilter
package de.maibornwolff.codecharta.analysers.filters.edgefilter

import com.varabyte.kotter.runtime.RunScope
import com.varabyte.kotter.runtime.Session
import de.maibornwolff.codecharta.analysers.analyserinterface.ParserDialogInterface
import de.maibornwolff.codecharta.dialogProvider.InputType
import de.maibornwolff.codecharta.dialogProvider.myPromptDefaultFileFolderInput
import de.maibornwolff.codecharta.dialogProvider.myPromptInput
import de.maibornwolff.codecharta.serialization.FileExtension
import de.maibornwolff.codecharta.tools.inquirer.InputType
import de.maibornwolff.codecharta.tools.inquirer.myPromptDefaultFileFolderInput
import de.maibornwolff.codecharta.tools.inquirer.myPromptInput
import de.maibornwolff.codecharta.tools.interactiveparser.ParserDialogInterface
import de.maibornwolff.codecharta.util.Logger

class ParserDialog {
Expand Down
4 changes: 2 additions & 2 deletions ...harta/filter/edgefilter/EdgeFilterTest.kt → ...harta/filter/edgefilter/EdgeFilterTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package de.maibornwolff.codecharta.filter.edgefilter
package de.maibornwolff.codecharta.analysers.filters.edgefilter

import de.maibornwolff.codecharta.filter.edgefilter.EdgeFilter.Companion.main
import de.maibornwolff.codecharta.analysers.filters.edgefilter.EdgeFilter.Companion.main
import de.maibornwolff.codecharta.util.InputHelper
import io.mockk.every
import io.mockk.mockkObject
Expand Down
4 changes: 2 additions & 2 deletions ...rta/filter/edgefilter/ParserDialogTest.kt → ...rta/filter/edgefilter/ParserDialogTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package de.maibornwolff.codecharta.filter.edgefilter
package de.maibornwolff.codecharta.analysers.filters.edgefilter

import com.varabyte.kotter.foundation.input.Keys
import com.varabyte.kotter.runtime.RunScope
import com.varabyte.kotter.runtime.terminal.inmemory.press
import com.varabyte.kotter.runtime.terminal.inmemory.type
import com.varabyte.kotterx.test.foundation.testSession
import de.maibornwolff.codecharta.filter.edgefilter.ParserDialog.Companion.collectParserArgs
import de.maibornwolff.codecharta.analysers.filters.edgefilter.ParserDialog.Companion.collectParserArgs
import io.mockk.every
import io.mockk.mockkObject
import org.assertj.core.api.Assertions.assertThat
Expand Down
2 changes: 1 addition & 1 deletion ...ta/filter/edgefilter/ProjectMergerTest.kt → ...ta/filter/edgefilter/ProjectMergerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.maibornwolff.codecharta.filter.edgefilter
package de.maibornwolff.codecharta.analysers.filters.edgefilter

import de.maibornwolff.codecharta.model.AttributeDescriptor
import de.maibornwolff.codecharta.model.Node
Expand Down
0 .../test/resources/coupling-empty-nodes.json → .../test/resources/coupling-empty-nodes.json
View file
Open in desktop
File renamed without changes.
0 ...ilter/src/test/resources/coupling.cc.json → ...ilter/src/test/resources/coupling.cc.json
View file
Open in desktop
File renamed without changes.
0 ...geFilter/src/test/resources/coupling.json → ...geFilter/src/test/resources/coupling.json
View file
Open in desktop
File renamed without changes.
0 ...test/resources/empty-but-descriptors.json → ...test/resources/empty-but-descriptors.json
View file
Open in desktop
File renamed without changes.
0 analysis/filter/MergeFilter/README.md → ...s/analysers/filters/MergeFilter/README.md
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions analysis/filter/MergeFilter/build.gradle.kts → ...sers/filters/MergeFilter/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dependencies {
implementation(project(":model"))
implementation(project(":tools:InteractiveParser"))
implementation(project(":tools:Inquirer"))
implementation(project(":analysers:AnalyserInterface"))
implementation(project(":dialogProvider"))

implementation(libs.kotter)
implementation(libs.kotter.test)
Expand Down
2 changes: 1 addition & 1 deletion ...decharta/filter/mergefilter/LargeMerge.kt → ...decharta/filter/mergefilter/LargeMerge.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.maibornwolff.codecharta.filter.mergefilter
package de.maibornwolff.codecharta.analysers.filters.mergefilter

import de.maibornwolff.codecharta.model.BlacklistItem
import de.maibornwolff.codecharta.model.Edge
Expand Down
2 changes: 1 addition & 1 deletion ...ter/mergefilter/LeafNodeMergerStrategy.kt → ...ter/mergefilter/LeafNodeMergerStrategy.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.maibornwolff.codecharta.filter.mergefilter
package de.maibornwolff.codecharta.analysers.filters.mergefilter

import de.maibornwolff.codecharta.model.MutableNode
import de.maibornwolff.codecharta.model.Path
Expand Down
3 changes: 3 additions & 0 deletions ...rgeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/mergefilter/MergeException.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package de.maibornwolff.codecharta.analysers.filters.mergefilter

class MergeException(s: String) : RuntimeException(s)
20 changes: 10 additions & 10 deletions ...echarta/filter/mergefilter/MergeFilter.kt → ...echarta/filter/mergefilter/MergeFilter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package de.maibornwolff.codecharta.filter.mergefilter

import de.maibornwolff.codecharta.filter.mergefilter.ParserDialog.Companion.askForceMerge
import de.maibornwolff.codecharta.filter.mergefilter.ParserDialog.Companion.requestMimoFileSelection
import de.maibornwolff.codecharta.filter.mergefilter.mimo.Mimo
package de.maibornwolff.codecharta.analysers.filters.mergefilter

import de.maibornwolff.codecharta.analysers.analyserinterface.AnalyserInterface
import de.maibornwolff.codecharta.analysers.analyserinterface.ParserDialogInterface
import de.maibornwolff.codecharta.analysers.analyserinterface.runInTerminalSession
import de.maibornwolff.codecharta.analysers.analyserinterface.util.CodeChartaConstants
import de.maibornwolff.codecharta.analysers.filters.mergefilter.ParserDialog.Companion.askForceMerge
import de.maibornwolff.codecharta.analysers.filters.mergefilter.ParserDialog.Companion.requestMimoFileSelection
import de.maibornwolff.codecharta.analysers.filters.mergefilter.mimo.Mimo
import de.maibornwolff.codecharta.model.Project
import de.maibornwolff.codecharta.serialization.ProjectDeserializer
import de.maibornwolff.codecharta.serialization.ProjectSerializer
import de.maibornwolff.codecharta.tools.interactiveparser.InteractiveParser
import de.maibornwolff.codecharta.tools.interactiveparser.ParserDialogInterface
import de.maibornwolff.codecharta.tools.interactiveparser.runInTerminalSession
import de.maibornwolff.codecharta.tools.interactiveparser.util.CodeChartaConstants
import de.maibornwolff.codecharta.util.InputHelper
import de.maibornwolff.codecharta.util.Logger
import picocli.CommandLine
Expand All @@ -24,7 +24,7 @@ import java.util.concurrent.Callable
)
class MergeFilter(
private val output: PrintStream = System.out
) : Callable<Unit?>, InteractiveParser {
) : Callable<Unit?>, AnalyserInterface {
@CommandLine.Option(names = ["-h", "--help"], usageHelp = true, description = ["displays this help and exits"])
var help: Boolean = false

Expand Down
2 changes: 1 addition & 1 deletion .../filter/mergefilter/NodeMergerStrategy.kt → .../filter/mergefilter/NodeMergerStrategy.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.maibornwolff.codecharta.filter.mergefilter
package de.maibornwolff.codecharta.analysers.filters.mergefilter

import de.maibornwolff.codecharta.model.MutableNode

Expand Down
20 changes: 10 additions & 10 deletions ...charta/filter/mergefilter/ParserDialog.kt → ...charta/filter/mergefilter/ParserDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package de.maibornwolff.codecharta.filter.mergefilter
package de.maibornwolff.codecharta.analysers.filters.mergefilter

import com.varabyte.kotter.runtime.RunScope
import com.varabyte.kotter.runtime.Session
import de.maibornwolff.codecharta.analysers.analyserinterface.ParserDialogInterface
import de.maibornwolff.codecharta.dialogProvider.InputType
import de.maibornwolff.codecharta.dialogProvider.InputValidator
import de.maibornwolff.codecharta.dialogProvider.myPromptCheckbox
import de.maibornwolff.codecharta.dialogProvider.myPromptConfirm
import de.maibornwolff.codecharta.dialogProvider.myPromptDefaultFileFolderInput
import de.maibornwolff.codecharta.dialogProvider.myPromptInput
import de.maibornwolff.codecharta.dialogProvider.myPromptInputNumber
import de.maibornwolff.codecharta.dialogProvider.myPromptList
import de.maibornwolff.codecharta.serialization.FileExtension
import de.maibornwolff.codecharta.tools.inquirer.InputType
import de.maibornwolff.codecharta.tools.inquirer.InputValidator
import de.maibornwolff.codecharta.tools.inquirer.myPromptCheckbox
import de.maibornwolff.codecharta.tools.inquirer.myPromptConfirm
import de.maibornwolff.codecharta.tools.inquirer.myPromptDefaultFileFolderInput
import de.maibornwolff.codecharta.tools.inquirer.myPromptInput
import de.maibornwolff.codecharta.tools.inquirer.myPromptInputNumber
import de.maibornwolff.codecharta.tools.inquirer.myPromptList
import de.maibornwolff.codecharta.tools.interactiveparser.ParserDialogInterface
import java.io.File

class ParserDialog {
Expand Down
2 changes: 1 addition & 1 deletion ...harta/filter/mergefilter/ProjectMerger.kt → ...harta/filter/mergefilter/ProjectMerger.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.maibornwolff.codecharta.filter.mergefilter
package de.maibornwolff.codecharta.analysers.filters.mergefilter

import de.maibornwolff.codecharta.model.AttributeDescriptor
import de.maibornwolff.codecharta.model.AttributeType
Expand Down
2 changes: 1 addition & 1 deletion ...ergefilter/RecursiveNodeMergerStrategy.kt → ...ergefilter/RecursiveNodeMergerStrategy.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.maibornwolff.codecharta.filter.mergefilter
package de.maibornwolff.codecharta.analysers.filters.mergefilter

import de.maibornwolff.codecharta.model.MutableNode
import de.maibornwolff.codecharta.util.Logger
Expand Down
6 changes: 3 additions & 3 deletions ...odecharta/filter/mergefilter/mimo/Mimo.kt → ...odecharta/filter/mergefilter/mimo/Mimo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package de.maibornwolff.codecharta.filter.mergefilter.mimo
package de.maibornwolff.codecharta.analysers.filters.mergefilter.mimo

import de.maibornwolff.codecharta.filter.mergefilter.ParserDialog
import de.maibornwolff.codecharta.tools.interactiveparser.runInTerminalSession
import de.maibornwolff.codecharta.analysers.analyserinterface.runInTerminalSession
import de.maibornwolff.codecharta.analysers.filters.mergefilter.ParserDialog
import de.maibornwolff.codecharta.util.Logger
import java.io.File

Expand Down
2 changes: 1 addition & 1 deletion .../filter/mergefilter/LeafNodeMergerTest.kt → .../filter/mergefilter/LeafNodeMergerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.maibornwolff.codecharta.filter.mergefilter
package de.maibornwolff.codecharta.analysers.filters.mergefilter

import de.maibornwolff.codecharta.model.MutableNode
import de.maibornwolff.codecharta.model.NodeType
Expand Down
Loading