From a6d89a64688eba26e92b2ac75846bbd332544bc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Fuch=C3=9F?= Date: Fri, 29 Nov 2024 20:18:50 +0100 Subject: [PATCH] Stages Pakage --- .../CodeTraceabilityState.java | 10 +++---- .../connectiongenerator/ConnectionState.java | 8 +++--- .../connectiongenerator/ConnectionStates.java | 2 +- .../connectiongenerator/InstanceLink.java | 6 ++--- .../inconsistency/Inconsistency.java | 2 +- .../inconsistency/InconsistencyState.java | 4 +-- .../inconsistency/InconsistencyStates.java | 2 +- .../inconsistency/InconsistentSentence.java | 2 +- .../inconsistency/ModelInconsistency.java | 2 +- .../inconsistency/TextInconsistency.java | 2 +- .../RecommendationState.java | 4 +-- .../RecommendationStateStrategy.java | 2 +- .../RecommendationStates.java | 2 +- .../RecommendedInstance.java | 4 +-- .../textextraction/MappingKind.java | 2 +- .../textextraction/NounMapping.java | 2 +- .../NounMappingChangeListener.java | 2 +- .../textextraction/PhraseAbbreviation.java | 2 +- .../textextraction/PhraseMapping.java | 2 +- .../PhraseMappingChangeListener.java | 2 +- .../{ => stage}/textextraction/TextState.java | 2 +- .../textextraction/TextStateStrategy.java | 2 +- .../textextraction/WordAbbreviation.java | 2 +- .../SadCodeTraceLink.java | 2 +- .../SadSamTraceLink.java | 4 +-- .../SamCodeTraceLink.java | 2 +- .../tracelinks => tracelink}/TraceLink.java | 2 +- .../TransitiveTraceLink.java | 2 +- .../core/common/util/CommonUtilities.java | 6 ++--- .../common/util/DataRepositoryHelper.java | 10 +++---- .../util/PhraseMappingAggregatorStrategy.java | 2 +- .../core/common/util/SimilarityUtils.java | 8 +++--- .../core/common/util/TraceLinkUtilities.java | 2 +- .../ardoco/core/api/output/ArDoCoResult.java | 26 +++++++++---------- .../ardoco/core/common/util/FilePrinter.java | 24 ++++++++--------- 35 files changed, 80 insertions(+), 80 deletions(-) rename framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/{ => stage}/codetraceability/CodeTraceabilityState.java (86%) rename framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/{ => stage}/connectiongenerator/ConnectionState.java (93%) rename framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/{ => stage}/connectiongenerator/ConnectionStates.java (81%) rename framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/{ => stage}/connectiongenerator/InstanceLink.java (95%) rename framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/{ => stage}/inconsistency/Inconsistency.java (94%) rename framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/{ => stage}/inconsistency/InconsistencyState.java (93%) rename framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/{ => stage}/inconsistency/InconsistencyStates.java (83%) rename framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/{ => stage}/inconsistency/InconsistentSentence.java (96%) rename framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/{ => stage}/inconsistency/ModelInconsistency.java (93%) rename framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/{ => stage}/inconsistency/TextInconsistency.java (84%) rename framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/{ => stage}/recommendationgenerator/RecommendationState.java (95%) rename framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/{ => stage}/recommendationgenerator/RecommendationStateStrategy.java (79%) rename framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/{ => stage}/recommendationgenerator/RecommendationStates.java (81%) rename framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/{ => stage}/recommendationgenerator/RecommendedInstance.java (95%) rename framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/{ => stage}/textextraction/MappingKind.java (86%) rename framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/{ => stage}/textextraction/NounMapping.java (97%) rename framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/{ => stage}/textextraction/NounMappingChangeListener.java (76%) rename framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/{ => stage}/textextraction/PhraseAbbreviation.java (95%) rename framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/{ => stage}/textextraction/PhraseMapping.java (95%) rename framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/{ => stage}/textextraction/PhraseMappingChangeListener.java (76%) rename framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/{ => stage}/textextraction/TextState.java (99%) rename framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/{ => stage}/textextraction/TextStateStrategy.java (98%) rename framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/{ => stage}/textextraction/WordAbbreviation.java (95%) rename framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/{models/tracelinks => tracelink}/SadCodeTraceLink.java (87%) rename framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/{models/tracelinks => tracelink}/SadSamTraceLink.java (94%) rename framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/{models/tracelinks => tracelink}/SamCodeTraceLink.java (96%) rename framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/{models/tracelinks => tracelink}/TraceLink.java (96%) rename framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/{models/tracelinks => tracelink}/TransitiveTraceLink.java (97%) diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/codetraceability/CodeTraceabilityState.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/codetraceability/CodeTraceabilityState.java similarity index 86% rename from framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/codetraceability/CodeTraceabilityState.java rename to framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/codetraceability/CodeTraceabilityState.java index 72e14f3bf..3243e82df 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/codetraceability/CodeTraceabilityState.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/codetraceability/CodeTraceabilityState.java @@ -1,5 +1,5 @@ /* Licensed under MIT 2023-2024. */ -package edu.kit.kastel.mcse.ardoco.core.api.codetraceability; +package edu.kit.kastel.mcse.ardoco.core.api.stage.codetraceability; import java.util.Collection; @@ -7,11 +7,11 @@ import edu.kit.kastel.mcse.ardoco.core.api.entity.ArchitectureEntity; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeCompilationUnit; -import edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks.SadCodeTraceLink; -import edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks.SamCodeTraceLink; -import edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks.TraceLink; -import edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks.TransitiveTraceLink; import edu.kit.kastel.mcse.ardoco.core.api.text.SentenceEntity; +import edu.kit.kastel.mcse.ardoco.core.api.tracelink.SadCodeTraceLink; +import edu.kit.kastel.mcse.ardoco.core.api.tracelink.SamCodeTraceLink; +import edu.kit.kastel.mcse.ardoco.core.api.tracelink.TraceLink; +import edu.kit.kastel.mcse.ardoco.core.api.tracelink.TransitiveTraceLink; import edu.kit.kastel.mcse.ardoco.core.architecture.Deterministic; import edu.kit.kastel.mcse.ardoco.core.data.PipelineStepData; diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/connectiongenerator/ConnectionState.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/connectiongenerator/ConnectionState.java similarity index 93% rename from framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/connectiongenerator/ConnectionState.java rename to framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/connectiongenerator/ConnectionState.java index c0f21f4ba..40460d9f6 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/connectiongenerator/ConnectionState.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/connectiongenerator/ConnectionState.java @@ -1,5 +1,5 @@ /* Licensed under MIT 2021-2024. */ -package edu.kit.kastel.mcse.ardoco.core.api.connectiongenerator; +package edu.kit.kastel.mcse.ardoco.core.api.stage.connectiongenerator; import org.eclipse.collections.api.factory.Sets; import org.eclipse.collections.api.list.ImmutableList; @@ -8,10 +8,10 @@ import edu.kit.kastel.mcse.ardoco.core.api.entity.ArchitectureEntity; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.legacy.ModelInstance; -import edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks.SadSamTraceLink; -import edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks.TraceLink; -import edu.kit.kastel.mcse.ardoco.core.api.recommendationgenerator.RecommendedInstance; +import edu.kit.kastel.mcse.ardoco.core.api.stage.recommendationgenerator.RecommendedInstance; import edu.kit.kastel.mcse.ardoco.core.api.text.SentenceEntity; +import edu.kit.kastel.mcse.ardoco.core.api.tracelink.SadSamTraceLink; +import edu.kit.kastel.mcse.ardoco.core.api.tracelink.TraceLink; import edu.kit.kastel.mcse.ardoco.core.architecture.Deterministic; import edu.kit.kastel.mcse.ardoco.core.configuration.IConfigurable; import edu.kit.kastel.mcse.ardoco.core.pipeline.agent.Claimant; diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/connectiongenerator/ConnectionStates.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/connectiongenerator/ConnectionStates.java similarity index 81% rename from framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/connectiongenerator/ConnectionStates.java rename to framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/connectiongenerator/ConnectionStates.java index 163acd7fc..3143e32a8 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/connectiongenerator/ConnectionStates.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/connectiongenerator/ConnectionStates.java @@ -1,5 +1,5 @@ /* Licensed under MIT 2022-2023. */ -package edu.kit.kastel.mcse.ardoco.core.api.connectiongenerator; +package edu.kit.kastel.mcse.ardoco.core.api.stage.connectiongenerator; import edu.kit.kastel.mcse.ardoco.core.api.models.Metamodel; import edu.kit.kastel.mcse.ardoco.core.data.PipelineStepData; diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/connectiongenerator/InstanceLink.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/connectiongenerator/InstanceLink.java similarity index 95% rename from framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/connectiongenerator/InstanceLink.java rename to framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/connectiongenerator/InstanceLink.java index 96ef072fe..e9ae9d999 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/connectiongenerator/InstanceLink.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/connectiongenerator/InstanceLink.java @@ -1,5 +1,5 @@ /* Licensed under MIT 2021-2024. */ -package edu.kit.kastel.mcse.ardoco.core.api.connectiongenerator; +package edu.kit.kastel.mcse.ardoco.core.api.stage.connectiongenerator; import java.io.Serializable; import java.util.Arrays; @@ -11,8 +11,8 @@ import org.eclipse.collections.api.list.MutableList; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.legacy.ModelInstance; -import edu.kit.kastel.mcse.ardoco.core.api.recommendationgenerator.RecommendedInstance; -import edu.kit.kastel.mcse.ardoco.core.api.textextraction.NounMapping; +import edu.kit.kastel.mcse.ardoco.core.api.stage.recommendationgenerator.RecommendedInstance; +import edu.kit.kastel.mcse.ardoco.core.api.stage.textextraction.NounMapping; import edu.kit.kastel.mcse.ardoco.core.architecture.Deterministic; import edu.kit.kastel.mcse.ardoco.core.common.AggregationFunctions; import edu.kit.kastel.mcse.ardoco.core.common.Internal; diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/inconsistency/Inconsistency.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/inconsistency/Inconsistency.java similarity index 94% rename from framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/inconsistency/Inconsistency.java rename to framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/inconsistency/Inconsistency.java index 27a5daea0..ab61b5765 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/inconsistency/Inconsistency.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/inconsistency/Inconsistency.java @@ -1,5 +1,5 @@ /* Licensed under MIT 2021-2024. */ -package edu.kit.kastel.mcse.ardoco.core.api.inconsistency; +package edu.kit.kastel.mcse.ardoco.core.api.stage.inconsistency; import java.io.Serializable; diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/inconsistency/InconsistencyState.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/inconsistency/InconsistencyState.java similarity index 93% rename from framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/inconsistency/InconsistencyState.java rename to framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/inconsistency/InconsistencyState.java index f3a03d89f..900a8c88b 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/inconsistency/InconsistencyState.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/inconsistency/InconsistencyState.java @@ -1,12 +1,12 @@ /* Licensed under MIT 2021-2023. */ -package edu.kit.kastel.mcse.ardoco.core.api.inconsistency; +package edu.kit.kastel.mcse.ardoco.core.api.stage.inconsistency; import java.util.List; import org.eclipse.collections.api.list.ImmutableList; import org.eclipse.collections.api.list.MutableList; -import edu.kit.kastel.mcse.ardoco.core.api.recommendationgenerator.RecommendedInstance; +import edu.kit.kastel.mcse.ardoco.core.api.stage.recommendationgenerator.RecommendedInstance; import edu.kit.kastel.mcse.ardoco.core.configuration.IConfigurable; /** diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/inconsistency/InconsistencyStates.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/inconsistency/InconsistencyStates.java similarity index 83% rename from framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/inconsistency/InconsistencyStates.java rename to framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/inconsistency/InconsistencyStates.java index 2a5a29f05..62ffa4093 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/inconsistency/InconsistencyStates.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/inconsistency/InconsistencyStates.java @@ -1,5 +1,5 @@ /* Licensed under MIT 2022-2023. */ -package edu.kit.kastel.mcse.ardoco.core.api.inconsistency; +package edu.kit.kastel.mcse.ardoco.core.api.stage.inconsistency; import edu.kit.kastel.mcse.ardoco.core.api.models.Metamodel; import edu.kit.kastel.mcse.ardoco.core.data.PipelineStepData; diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/inconsistency/InconsistentSentence.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/inconsistency/InconsistentSentence.java similarity index 96% rename from framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/inconsistency/InconsistentSentence.java rename to framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/inconsistency/InconsistentSentence.java index f8e38f76f..c85368a28 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/inconsistency/InconsistentSentence.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/inconsistency/InconsistentSentence.java @@ -1,5 +1,5 @@ /* Licensed under MIT 2022-2023. */ -package edu.kit.kastel.mcse.ardoco.core.api.inconsistency; +package edu.kit.kastel.mcse.ardoco.core.api.stage.inconsistency; import java.util.List; import java.util.Locale; diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/inconsistency/ModelInconsistency.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/inconsistency/ModelInconsistency.java similarity index 93% rename from framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/inconsistency/ModelInconsistency.java rename to framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/inconsistency/ModelInconsistency.java index 4a2787c80..80bed118b 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/inconsistency/ModelInconsistency.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/inconsistency/ModelInconsistency.java @@ -1,5 +1,5 @@ /* Licensed under MIT 2022-2023. */ -package edu.kit.kastel.mcse.ardoco.core.api.inconsistency; +package edu.kit.kastel.mcse.ardoco.core.api.stage.inconsistency; /** * This interface extends the interface {@link Inconsistency} by stating that the inconsistency stems from a concrete model instance, i.e., a component. diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/inconsistency/TextInconsistency.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/inconsistency/TextInconsistency.java similarity index 84% rename from framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/inconsistency/TextInconsistency.java rename to framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/inconsistency/TextInconsistency.java index c3e3427a2..77adad2ec 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/inconsistency/TextInconsistency.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/inconsistency/TextInconsistency.java @@ -1,5 +1,5 @@ /* Licensed under MIT 2022-2023. */ -package edu.kit.kastel.mcse.ardoco.core.api.inconsistency; +package edu.kit.kastel.mcse.ardoco.core.api.stage.inconsistency; /** * This interface extends the interface {@link Inconsistency} by stating that the inconsistency stems from a concrete textual diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/recommendationgenerator/RecommendationState.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/recommendationgenerator/RecommendationState.java similarity index 95% rename from framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/recommendationgenerator/RecommendationState.java rename to framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/recommendationgenerator/RecommendationState.java index 55f27209a..8fb2dbd3f 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/recommendationgenerator/RecommendationState.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/recommendationgenerator/RecommendationState.java @@ -1,9 +1,9 @@ /* Licensed under MIT 2021-2023. */ -package edu.kit.kastel.mcse.ardoco.core.api.recommendationgenerator; +package edu.kit.kastel.mcse.ardoco.core.api.stage.recommendationgenerator; import org.eclipse.collections.api.list.ImmutableList; -import edu.kit.kastel.mcse.ardoco.core.api.textextraction.NounMapping; +import edu.kit.kastel.mcse.ardoco.core.api.stage.textextraction.NounMapping; import edu.kit.kastel.mcse.ardoco.core.configuration.IConfigurable; import edu.kit.kastel.mcse.ardoco.core.pipeline.agent.Claimant; diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/recommendationgenerator/RecommendationStateStrategy.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/recommendationgenerator/RecommendationStateStrategy.java similarity index 79% rename from framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/recommendationgenerator/RecommendationStateStrategy.java rename to framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/recommendationgenerator/RecommendationStateStrategy.java index 509476aea..d74478ea4 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/recommendationgenerator/RecommendationStateStrategy.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/recommendationgenerator/RecommendationStateStrategy.java @@ -1,5 +1,5 @@ /* Licensed under MIT 2024. */ -package edu.kit.kastel.mcse.ardoco.core.api.recommendationgenerator; +package edu.kit.kastel.mcse.ardoco.core.api.stage.recommendationgenerator; import java.io.Serializable; diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/recommendationgenerator/RecommendationStates.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/recommendationgenerator/RecommendationStates.java similarity index 81% rename from framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/recommendationgenerator/RecommendationStates.java rename to framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/recommendationgenerator/RecommendationStates.java index fa872b746..c0e8f97e2 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/recommendationgenerator/RecommendationStates.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/recommendationgenerator/RecommendationStates.java @@ -1,5 +1,5 @@ /* Licensed under MIT 2022-2023. */ -package edu.kit.kastel.mcse.ardoco.core.api.recommendationgenerator; +package edu.kit.kastel.mcse.ardoco.core.api.stage.recommendationgenerator; import edu.kit.kastel.mcse.ardoco.core.api.models.Metamodel; import edu.kit.kastel.mcse.ardoco.core.data.PipelineStepData; diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/recommendationgenerator/RecommendedInstance.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/recommendationgenerator/RecommendedInstance.java similarity index 95% rename from framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/recommendationgenerator/RecommendedInstance.java rename to framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/recommendationgenerator/RecommendedInstance.java index f4a7b05b0..b87f37d6c 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/recommendationgenerator/RecommendedInstance.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/recommendationgenerator/RecommendedInstance.java @@ -1,11 +1,11 @@ /* Licensed under MIT 2021-2024. */ -package edu.kit.kastel.mcse.ardoco.core.api.recommendationgenerator; +package edu.kit.kastel.mcse.ardoco.core.api.stage.recommendationgenerator; import org.eclipse.collections.api.list.ImmutableList; import org.eclipse.collections.api.set.sorted.ImmutableSortedSet; import edu.kit.kastel.mcse.ardoco.core.api.entity.TextEntity; -import edu.kit.kastel.mcse.ardoco.core.api.textextraction.NounMapping; +import edu.kit.kastel.mcse.ardoco.core.api.stage.textextraction.NounMapping; import edu.kit.kastel.mcse.ardoco.core.pipeline.agent.Claimant; /** diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/textextraction/MappingKind.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/textextraction/MappingKind.java similarity index 86% rename from framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/textextraction/MappingKind.java rename to framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/textextraction/MappingKind.java index 477bed3c7..f63081865 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/textextraction/MappingKind.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/textextraction/MappingKind.java @@ -1,5 +1,5 @@ /* Licensed under MIT 2021-2023. */ -package edu.kit.kastel.mcse.ardoco.core.api.textextraction; +package edu.kit.kastel.mcse.ardoco.core.api.stage.textextraction; /** * The mapping type of a mapping state defines whether the mapping is a name or a type. diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/textextraction/NounMapping.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/textextraction/NounMapping.java similarity index 97% rename from framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/textextraction/NounMapping.java rename to framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/textextraction/NounMapping.java index d660dc30e..1452a1583 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/textextraction/NounMapping.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/textextraction/NounMapping.java @@ -1,5 +1,5 @@ /* Licensed under MIT 2021-2024. */ -package edu.kit.kastel.mcse.ardoco.core.api.textextraction; +package edu.kit.kastel.mcse.ardoco.core.api.stage.textextraction; import java.io.Serializable; diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/textextraction/NounMappingChangeListener.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/textextraction/NounMappingChangeListener.java similarity index 76% rename from framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/textextraction/NounMappingChangeListener.java rename to framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/textextraction/NounMappingChangeListener.java index 39bf9e661..db4a34535 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/textextraction/NounMappingChangeListener.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/textextraction/NounMappingChangeListener.java @@ -1,5 +1,5 @@ /* Licensed under MIT 2022-2024. */ -package edu.kit.kastel.mcse.ardoco.core.api.textextraction; +package edu.kit.kastel.mcse.ardoco.core.api.stage.textextraction; import java.io.Serializable; diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/textextraction/PhraseAbbreviation.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/textextraction/PhraseAbbreviation.java similarity index 95% rename from framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/textextraction/PhraseAbbreviation.java rename to framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/textextraction/PhraseAbbreviation.java index 2b7e0328b..067d0733d 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/textextraction/PhraseAbbreviation.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/textextraction/PhraseAbbreviation.java @@ -1,5 +1,5 @@ /* Licensed under MIT 2023-2024. */ -package edu.kit.kastel.mcse.ardoco.core.api.textextraction; +package edu.kit.kastel.mcse.ardoco.core.api.stage.textextraction; import java.util.LinkedHashSet; import java.util.Set; diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/textextraction/PhraseMapping.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/textextraction/PhraseMapping.java similarity index 95% rename from framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/textextraction/PhraseMapping.java rename to framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/textextraction/PhraseMapping.java index f573e8368..f8aa655c7 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/textextraction/PhraseMapping.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/textextraction/PhraseMapping.java @@ -1,5 +1,5 @@ /* Licensed under MIT 2022-2024. */ -package edu.kit.kastel.mcse.ardoco.core.api.textextraction; +package edu.kit.kastel.mcse.ardoco.core.api.stage.textextraction; import java.io.Serializable; diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/textextraction/PhraseMappingChangeListener.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/textextraction/PhraseMappingChangeListener.java similarity index 76% rename from framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/textextraction/PhraseMappingChangeListener.java rename to framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/textextraction/PhraseMappingChangeListener.java index ec5510cc1..2e5ee8c9d 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/textextraction/PhraseMappingChangeListener.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/textextraction/PhraseMappingChangeListener.java @@ -1,5 +1,5 @@ /* Licensed under MIT 2022-2024. */ -package edu.kit.kastel.mcse.ardoco.core.api.textextraction; +package edu.kit.kastel.mcse.ardoco.core.api.stage.textextraction; import java.io.Serializable; diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/textextraction/TextState.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/textextraction/TextState.java similarity index 99% rename from framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/textextraction/TextState.java rename to framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/textextraction/TextState.java index 928c10369..d6eb2d10a 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/textextraction/TextState.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/textextraction/TextState.java @@ -1,5 +1,5 @@ /* Licensed under MIT 2021-2024. */ -package edu.kit.kastel.mcse.ardoco.core.api.textextraction; +package edu.kit.kastel.mcse.ardoco.core.api.stage.textextraction; import java.util.Optional; diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/textextraction/TextStateStrategy.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/textextraction/TextStateStrategy.java similarity index 98% rename from framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/textextraction/TextStateStrategy.java rename to framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/textextraction/TextStateStrategy.java index b6b85ddf7..668cae976 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/textextraction/TextStateStrategy.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/textextraction/TextStateStrategy.java @@ -1,5 +1,5 @@ /* Licensed under MIT 2022-2024. */ -package edu.kit.kastel.mcse.ardoco.core.api.textextraction; +package edu.kit.kastel.mcse.ardoco.core.api.stage.textextraction; import static edu.kit.kastel.mcse.ardoco.core.common.AggregationFunctions.AVERAGE; diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/textextraction/WordAbbreviation.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/textextraction/WordAbbreviation.java similarity index 95% rename from framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/textextraction/WordAbbreviation.java rename to framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/textextraction/WordAbbreviation.java index 6edcbc8a9..d1bd1ea53 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/textextraction/WordAbbreviation.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/stage/textextraction/WordAbbreviation.java @@ -1,5 +1,5 @@ /* Licensed under MIT 2023-2024. */ -package edu.kit.kastel.mcse.ardoco.core.api.textextraction; +package edu.kit.kastel.mcse.ardoco.core.api.stage.textextraction; import java.util.LinkedHashSet; import java.util.Set; diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/SadCodeTraceLink.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/tracelink/SadCodeTraceLink.java similarity index 87% rename from framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/SadCodeTraceLink.java rename to framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/tracelink/SadCodeTraceLink.java index b282d7076..1359745f6 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/SadCodeTraceLink.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/tracelink/SadCodeTraceLink.java @@ -1,5 +1,5 @@ /* Licensed under MIT 2023-2024. */ -package edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks; +package edu.kit.kastel.mcse.ardoco.core.api.tracelink; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeCompilationUnit; import edu.kit.kastel.mcse.ardoco.core.api.text.SentenceEntity; diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/SadSamTraceLink.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/tracelink/SadSamTraceLink.java similarity index 94% rename from framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/SadSamTraceLink.java rename to framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/tracelink/SadSamTraceLink.java index 844a2ab6c..8b835d12a 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/SadSamTraceLink.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/tracelink/SadSamTraceLink.java @@ -1,11 +1,11 @@ /* Licensed under MIT 2021-2024. */ -package edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks; +package edu.kit.kastel.mcse.ardoco.core.api.tracelink; import java.util.Objects; -import edu.kit.kastel.mcse.ardoco.core.api.connectiongenerator.InstanceLink; import edu.kit.kastel.mcse.ardoco.core.api.entity.ArchitectureEntity; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.legacy.ModelInstance; +import edu.kit.kastel.mcse.ardoco.core.api.stage.connectiongenerator.InstanceLink; import edu.kit.kastel.mcse.ardoco.core.api.text.Sentence; import edu.kit.kastel.mcse.ardoco.core.api.text.SentenceEntity; import edu.kit.kastel.mcse.ardoco.core.api.text.Word; diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/SamCodeTraceLink.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/tracelink/SamCodeTraceLink.java similarity index 96% rename from framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/SamCodeTraceLink.java rename to framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/tracelink/SamCodeTraceLink.java index 83495f13b..945f5f7c0 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/SamCodeTraceLink.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/tracelink/SamCodeTraceLink.java @@ -1,5 +1,5 @@ /* Licensed under MIT 2023-2024. */ -package edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks; +package edu.kit.kastel.mcse.ardoco.core.api.tracelink; import java.util.Objects; diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/TraceLink.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/tracelink/TraceLink.java similarity index 96% rename from framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/TraceLink.java rename to framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/tracelink/TraceLink.java index 90a58c6ef..be9120a57 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/TraceLink.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/tracelink/TraceLink.java @@ -1,5 +1,5 @@ /* Licensed under MIT 2023-2024. */ -package edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks; +package edu.kit.kastel.mcse.ardoco.core.api.tracelink; import java.io.Serial; import java.io.Serializable; diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/TransitiveTraceLink.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/tracelink/TransitiveTraceLink.java similarity index 97% rename from framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/TransitiveTraceLink.java rename to framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/tracelink/TransitiveTraceLink.java index 8a4d50b40..c6d5d4ef7 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/TransitiveTraceLink.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/tracelink/TransitiveTraceLink.java @@ -1,5 +1,5 @@ /* Licensed under MIT 2023-2024. */ -package edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks; +package edu.kit.kastel.mcse.ardoco.core.api.tracelink; import java.util.Objects; import java.util.Optional; diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/CommonUtilities.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/CommonUtilities.java index 7b9d87011..a0b308f2b 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/CommonUtilities.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/CommonUtilities.java @@ -23,11 +23,11 @@ import org.slf4j.LoggerFactory; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.legacy.LegacyModelExtractionState; -import edu.kit.kastel.mcse.ardoco.core.api.recommendationgenerator.RecommendationState; -import edu.kit.kastel.mcse.ardoco.core.api.recommendationgenerator.RecommendedInstance; +import edu.kit.kastel.mcse.ardoco.core.api.stage.recommendationgenerator.RecommendationState; +import edu.kit.kastel.mcse.ardoco.core.api.stage.recommendationgenerator.RecommendedInstance; +import edu.kit.kastel.mcse.ardoco.core.api.stage.textextraction.NounMapping; import edu.kit.kastel.mcse.ardoco.core.api.text.DependencyTag; import edu.kit.kastel.mcse.ardoco.core.api.text.Word; -import edu.kit.kastel.mcse.ardoco.core.api.textextraction.NounMapping; import edu.kit.kastel.mcse.ardoco.core.pipeline.agent.Claimant; /** diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/DataRepositoryHelper.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/DataRepositoryHelper.java index be8ca61c3..382d73235 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/DataRepositoryHelper.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/DataRepositoryHelper.java @@ -10,13 +10,13 @@ import edu.kit.kastel.mcse.ardoco.core.api.InputTextData; import edu.kit.kastel.mcse.ardoco.core.api.PreprocessingData; -import edu.kit.kastel.mcse.ardoco.core.api.codetraceability.CodeTraceabilityState; -import edu.kit.kastel.mcse.ardoco.core.api.connectiongenerator.ConnectionStates; -import edu.kit.kastel.mcse.ardoco.core.api.inconsistency.InconsistencyStates; import edu.kit.kastel.mcse.ardoco.core.api.models.ModelStates; -import edu.kit.kastel.mcse.ardoco.core.api.recommendationgenerator.RecommendationStates; +import edu.kit.kastel.mcse.ardoco.core.api.stage.codetraceability.CodeTraceabilityState; +import edu.kit.kastel.mcse.ardoco.core.api.stage.connectiongenerator.ConnectionStates; +import edu.kit.kastel.mcse.ardoco.core.api.stage.inconsistency.InconsistencyStates; +import edu.kit.kastel.mcse.ardoco.core.api.stage.recommendationgenerator.RecommendationStates; +import edu.kit.kastel.mcse.ardoco.core.api.stage.textextraction.TextState; import edu.kit.kastel.mcse.ardoco.core.api.text.Text; -import edu.kit.kastel.mcse.ardoco.core.api.textextraction.TextState; import edu.kit.kastel.mcse.ardoco.core.data.DataRepository; import edu.kit.kastel.mcse.ardoco.core.data.DeepCopy; import edu.kit.kastel.mcse.ardoco.core.data.PipelineStepData; diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/PhraseMappingAggregatorStrategy.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/PhraseMappingAggregatorStrategy.java index 87e0955aa..4f2fd412c 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/PhraseMappingAggregatorStrategy.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/PhraseMappingAggregatorStrategy.java @@ -6,7 +6,7 @@ import java.util.function.ToDoubleBiFunction; -import edu.kit.kastel.mcse.ardoco.core.api.textextraction.PhraseMapping; +import edu.kit.kastel.mcse.ardoco.core.api.stage.textextraction.PhraseMapping; import edu.kit.kastel.mcse.ardoco.core.architecture.Deterministic; @Deterministic diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/SimilarityUtils.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/SimilarityUtils.java index e5b7b06c6..797166686 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/SimilarityUtils.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/SimilarityUtils.java @@ -14,12 +14,12 @@ import org.eclipse.collections.api.map.sorted.ImmutableSortedMap; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.legacy.ModelInstance; -import edu.kit.kastel.mcse.ardoco.core.api.recommendationgenerator.RecommendedInstance; +import edu.kit.kastel.mcse.ardoco.core.api.stage.recommendationgenerator.RecommendedInstance; +import edu.kit.kastel.mcse.ardoco.core.api.stage.textextraction.NounMapping; +import edu.kit.kastel.mcse.ardoco.core.api.stage.textextraction.PhraseMapping; +import edu.kit.kastel.mcse.ardoco.core.api.stage.textextraction.TextState; import edu.kit.kastel.mcse.ardoco.core.api.text.PhraseType; import edu.kit.kastel.mcse.ardoco.core.api.text.Word; -import edu.kit.kastel.mcse.ardoco.core.api.textextraction.NounMapping; -import edu.kit.kastel.mcse.ardoco.core.api.textextraction.PhraseMapping; -import edu.kit.kastel.mcse.ardoco.core.api.textextraction.TextState; import edu.kit.kastel.mcse.ardoco.core.architecture.Deterministic; import edu.kit.kastel.mcse.ardoco.core.common.tuple.Pair; import edu.kit.kastel.mcse.ardoco.core.common.util.wordsim.WordSimUtils; diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/TraceLinkUtilities.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/TraceLinkUtilities.java index cb4509ba8..d4b560feb 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/TraceLinkUtilities.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/TraceLinkUtilities.java @@ -7,8 +7,8 @@ import edu.kit.kastel.mcse.ardoco.core.api.entity.ArchitectureEntity; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeCompilationUnit; -import edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks.TraceLink; import edu.kit.kastel.mcse.ardoco.core.api.text.SentenceEntity; +import edu.kit.kastel.mcse.ardoco.core.api.tracelink.TraceLink; import edu.kit.kastel.mcse.ardoco.core.common.tuple.Pair; public class TraceLinkUtilities { diff --git a/pipeline-core/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/output/ArDoCoResult.java b/pipeline-core/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/output/ArDoCoResult.java index 48b821436..da54073d5 100644 --- a/pipeline-core/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/output/ArDoCoResult.java +++ b/pipeline-core/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/output/ArDoCoResult.java @@ -17,28 +17,28 @@ import org.slf4j.LoggerFactory; import edu.kit.kastel.mcse.ardoco.core.api.PreprocessingData; -import edu.kit.kastel.mcse.ardoco.core.api.codetraceability.CodeTraceabilityState; -import edu.kit.kastel.mcse.ardoco.core.api.connectiongenerator.ConnectionState; import edu.kit.kastel.mcse.ardoco.core.api.entity.ArchitectureEntity; -import edu.kit.kastel.mcse.ardoco.core.api.inconsistency.Inconsistency; -import edu.kit.kastel.mcse.ardoco.core.api.inconsistency.InconsistencyState; -import edu.kit.kastel.mcse.ardoco.core.api.inconsistency.InconsistentSentence; -import edu.kit.kastel.mcse.ardoco.core.api.inconsistency.ModelInconsistency; -import edu.kit.kastel.mcse.ardoco.core.api.inconsistency.TextInconsistency; import edu.kit.kastel.mcse.ardoco.core.api.models.Metamodel; import edu.kit.kastel.mcse.ardoco.core.api.models.ModelStates; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.legacy.LegacyModelExtractionState; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.legacy.ModelInstance; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeCompilationUnit; -import edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks.SadSamTraceLink; -import edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks.SamCodeTraceLink; -import edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks.TraceLink; -import edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks.TransitiveTraceLink; -import edu.kit.kastel.mcse.ardoco.core.api.recommendationgenerator.RecommendationState; +import edu.kit.kastel.mcse.ardoco.core.api.stage.codetraceability.CodeTraceabilityState; +import edu.kit.kastel.mcse.ardoco.core.api.stage.connectiongenerator.ConnectionState; +import edu.kit.kastel.mcse.ardoco.core.api.stage.inconsistency.Inconsistency; +import edu.kit.kastel.mcse.ardoco.core.api.stage.inconsistency.InconsistencyState; +import edu.kit.kastel.mcse.ardoco.core.api.stage.inconsistency.InconsistentSentence; +import edu.kit.kastel.mcse.ardoco.core.api.stage.inconsistency.ModelInconsistency; +import edu.kit.kastel.mcse.ardoco.core.api.stage.inconsistency.TextInconsistency; +import edu.kit.kastel.mcse.ardoco.core.api.stage.recommendationgenerator.RecommendationState; +import edu.kit.kastel.mcse.ardoco.core.api.stage.textextraction.TextState; import edu.kit.kastel.mcse.ardoco.core.api.text.Sentence; import edu.kit.kastel.mcse.ardoco.core.api.text.SentenceEntity; import edu.kit.kastel.mcse.ardoco.core.api.text.Text; -import edu.kit.kastel.mcse.ardoco.core.api.textextraction.TextState; +import edu.kit.kastel.mcse.ardoco.core.api.tracelink.SadSamTraceLink; +import edu.kit.kastel.mcse.ardoco.core.api.tracelink.SamCodeTraceLink; +import edu.kit.kastel.mcse.ardoco.core.api.tracelink.TraceLink; +import edu.kit.kastel.mcse.ardoco.core.api.tracelink.TransitiveTraceLink; import edu.kit.kastel.mcse.ardoco.core.architecture.Deterministic; import edu.kit.kastel.mcse.ardoco.core.common.util.DataRepositoryHelper; import edu.kit.kastel.mcse.ardoco.core.data.DataRepository; diff --git a/pipeline-core/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/FilePrinter.java b/pipeline-core/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/FilePrinter.java index 306f11bc4..0c3e0294e 100644 --- a/pipeline-core/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/FilePrinter.java +++ b/pipeline-core/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/FilePrinter.java @@ -32,26 +32,26 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import edu.kit.kastel.mcse.ardoco.core.api.connectiongenerator.ConnectionState; -import edu.kit.kastel.mcse.ardoco.core.api.connectiongenerator.InstanceLink; import edu.kit.kastel.mcse.ardoco.core.api.entity.ArchitectureEntity; -import edu.kit.kastel.mcse.ardoco.core.api.inconsistency.Inconsistency; -import edu.kit.kastel.mcse.ardoco.core.api.inconsistency.InconsistencyState; -import edu.kit.kastel.mcse.ardoco.core.api.inconsistency.InconsistentSentence; -import edu.kit.kastel.mcse.ardoco.core.api.inconsistency.ModelInconsistency; import edu.kit.kastel.mcse.ardoco.core.api.models.Metamodel; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.legacy.LegacyModelExtractionState; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.legacy.ModelInstance; -import edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks.TraceLink; import edu.kit.kastel.mcse.ardoco.core.api.output.ArDoCoResult; -import edu.kit.kastel.mcse.ardoco.core.api.recommendationgenerator.RecommendationState; -import edu.kit.kastel.mcse.ardoco.core.api.recommendationgenerator.RecommendedInstance; +import edu.kit.kastel.mcse.ardoco.core.api.stage.connectiongenerator.ConnectionState; +import edu.kit.kastel.mcse.ardoco.core.api.stage.connectiongenerator.InstanceLink; +import edu.kit.kastel.mcse.ardoco.core.api.stage.inconsistency.Inconsistency; +import edu.kit.kastel.mcse.ardoco.core.api.stage.inconsistency.InconsistencyState; +import edu.kit.kastel.mcse.ardoco.core.api.stage.inconsistency.InconsistentSentence; +import edu.kit.kastel.mcse.ardoco.core.api.stage.inconsistency.ModelInconsistency; +import edu.kit.kastel.mcse.ardoco.core.api.stage.recommendationgenerator.RecommendationState; +import edu.kit.kastel.mcse.ardoco.core.api.stage.recommendationgenerator.RecommendedInstance; +import edu.kit.kastel.mcse.ardoco.core.api.stage.textextraction.MappingKind; +import edu.kit.kastel.mcse.ardoco.core.api.stage.textextraction.NounMapping; +import edu.kit.kastel.mcse.ardoco.core.api.stage.textextraction.TextState; import edu.kit.kastel.mcse.ardoco.core.api.text.SentenceEntity; import edu.kit.kastel.mcse.ardoco.core.api.text.Text; import edu.kit.kastel.mcse.ardoco.core.api.text.Word; -import edu.kit.kastel.mcse.ardoco.core.api.textextraction.MappingKind; -import edu.kit.kastel.mcse.ardoco.core.api.textextraction.NounMapping; -import edu.kit.kastel.mcse.ardoco.core.api.textextraction.TextState; +import edu.kit.kastel.mcse.ardoco.core.api.tracelink.TraceLink; import edu.kit.kastel.mcse.ardoco.core.architecture.Deterministic; /**