From 5f6b812ccf6a7e8d8e81b4ce154243cc0bc96a4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Fuch=C3=9F?= Date: Fri, 29 Nov 2024 20:13:12 +0100 Subject: [PATCH] Move entity --- .../ardoco/tlr/codetraceability/CodeTraceabilityStateImpl.java | 2 +- .../tlr/codetraceability/informants/TraceLinkCombiner.java | 2 +- .../codetraceability/informants/arcotl/NameComparisonUtils.java | 2 +- .../informants/arcotl/computation/NodeResult.java | 2 +- .../informants/arcotl/functions/aggregation/Filter.java | 2 +- .../informants/arcotl/functions/aggregation/MatchBest.java | 2 +- .../arcotl/functions/aggregation/MatchSequentially.java | 2 +- .../informants/arcotl/functions/aggregation/Matcher.java | 2 +- .../arcotl/functions/heuristics/ComponentNameResemblance.java | 2 +- .../functions/heuristics/ComponentNameResemblanceTest.java | 2 +- .../arcotl/functions/heuristics/PackageResemblance.java | 2 +- .../informants/arcotl/functions/heuristics/PathResemblance.java | 2 +- .../functions/heuristics/ProvidedInterfaceCorrespondence.java | 2 +- .../informants/arcotl/functions/heuristics/Required.java | 2 +- .../arcotl/functions/heuristics/SubpackageFilter.java | 2 +- .../arcotl/functions/heuristics/SubpackageFilter2.java | 2 +- .../ardoco/tlr/models/generators/ArchitectureExtractorTest.java | 2 +- .../ardoco/tlr/models/generators/java/JavaExtractorTest.java | 2 +- .../tlr/recommendationgenerator/RecommendedInstanceImpl.java | 2 +- .../tests/integration/tlrhelper/ModelElementSentenceLink.java | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/CodeTraceabilityStateImpl.java b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/CodeTraceabilityStateImpl.java index a380144..14c043c 100644 --- a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/CodeTraceabilityStateImpl.java +++ b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/CodeTraceabilityStateImpl.java @@ -10,8 +10,8 @@ import org.eclipse.collections.impl.factory.Sets; import edu.kit.kastel.mcse.ardoco.core.api.codetraceability.CodeTraceabilityState; +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.entity.ArchitectureEntity; 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.architecture.Deterministic; diff --git a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/TraceLinkCombiner.java b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/TraceLinkCombiner.java index 5af56a1..981cd00 100644 --- a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/TraceLinkCombiner.java +++ b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/TraceLinkCombiner.java @@ -9,9 +9,9 @@ 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.entity.ArchitectureEntity; import edu.kit.kastel.mcse.ardoco.core.api.models.ModelStates; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeCompilationUnit; -import edu.kit.kastel.mcse.ardoco.core.api.models.entity.ArchitectureEntity; 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; diff --git a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/NameComparisonUtils.java b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/NameComparisonUtils.java index 56b33b6..9632d69 100644 --- a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/NameComparisonUtils.java +++ b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/NameComparisonUtils.java @@ -7,10 +7,10 @@ import java.util.SortedSet; import java.util.TreeSet; +import edu.kit.kastel.mcse.ardoco.core.api.entity.Entity; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeCompilationUnit; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeModule; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodePackage; -import edu.kit.kastel.mcse.ardoco.core.api.models.entity.Entity; import edu.stanford.nlp.ling.CoreLabel; import edu.stanford.nlp.pipeline.CoreDocument; import edu.stanford.nlp.pipeline.StanfordCoreNLP; diff --git a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/computation/NodeResult.java b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/computation/NodeResult.java index 2a0ee90..f3d5937 100644 --- a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/computation/NodeResult.java +++ b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/computation/NodeResult.java @@ -8,11 +8,11 @@ import java.util.SortedSet; import java.util.TreeSet; +import edu.kit.kastel.mcse.ardoco.core.api.entity.Entity; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.ArchitectureModel; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.CodeModel; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureItem; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeCompilationUnit; -import edu.kit.kastel.mcse.ardoco.core.api.models.entity.Entity; import edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks.SamCodeTraceLink; import edu.kit.kastel.mcse.ardoco.core.architecture.Deterministic; import edu.kit.kastel.mcse.ardoco.core.common.tuple.Pair; diff --git a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/aggregation/Filter.java b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/aggregation/Filter.java index d257720..5ec1243 100644 --- a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/aggregation/Filter.java +++ b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/aggregation/Filter.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; -import edu.kit.kastel.mcse.ardoco.core.api.models.entity.Entity; +import edu.kit.kastel.mcse.ardoco.core.api.entity.Entity; import edu.kit.kastel.mcse.ardoco.core.architecture.Deterministic; import edu.kit.kastel.mcse.ardoco.tlr.codetraceability.informants.arcotl.computation.NodeResult; import edu.kit.kastel.mcse.ardoco.tlr.codetraceability.informants.arcotl.computation.computationtree.AggregationNode; diff --git a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/aggregation/MatchBest.java b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/aggregation/MatchBest.java index a066dd5..32bfd79 100644 --- a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/aggregation/MatchBest.java +++ b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/aggregation/MatchBest.java @@ -3,7 +3,7 @@ import java.util.List; -import edu.kit.kastel.mcse.ardoco.core.api.models.entity.Entity; +import edu.kit.kastel.mcse.ardoco.core.api.entity.Entity; import edu.kit.kastel.mcse.ardoco.tlr.codetraceability.informants.arcotl.computation.Confidence; import edu.kit.kastel.mcse.ardoco.tlr.codetraceability.informants.arcotl.computation.NodeResult; import edu.kit.kastel.mcse.ardoco.tlr.codetraceability.informants.arcotl.computation.computationtree.AggregationNode; diff --git a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/aggregation/MatchSequentially.java b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/aggregation/MatchSequentially.java index 5790908..22e3ad7 100644 --- a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/aggregation/MatchSequentially.java +++ b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/aggregation/MatchSequentially.java @@ -3,7 +3,7 @@ import java.util.List; -import edu.kit.kastel.mcse.ardoco.core.api.models.entity.Entity; +import edu.kit.kastel.mcse.ardoco.core.api.entity.Entity; import edu.kit.kastel.mcse.ardoco.tlr.codetraceability.informants.arcotl.computation.NodeResult; import edu.kit.kastel.mcse.ardoco.tlr.codetraceability.informants.arcotl.computation.computationtree.AggregationNode; import edu.kit.kastel.mcse.ardoco.tlr.codetraceability.informants.arcotl.computation.computationtree.Node; diff --git a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/aggregation/Matcher.java b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/aggregation/Matcher.java index 8f6d974..707f5b9 100644 --- a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/aggregation/Matcher.java +++ b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/aggregation/Matcher.java @@ -4,9 +4,9 @@ import java.util.List; import java.util.Objects; +import edu.kit.kastel.mcse.ardoco.core.api.entity.Entity; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.ArchitectureModel; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.CodeModel; -import edu.kit.kastel.mcse.ardoco.core.api.models.entity.Entity; import edu.kit.kastel.mcse.ardoco.tlr.codetraceability.informants.arcotl.computation.NodeResult; public abstract class Matcher extends Aggregation { diff --git a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/ComponentNameResemblance.java b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/ComponentNameResemblance.java index e424b3b..339e8e6 100644 --- a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/ComponentNameResemblance.java +++ b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/ComponentNameResemblance.java @@ -3,13 +3,13 @@ import java.util.Objects; +import edu.kit.kastel.mcse.ardoco.core.api.entity.Entity; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureComponent; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureInterface; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureItem; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeCompilationUnit; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeItem; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.InterfaceUnit; -import edu.kit.kastel.mcse.ardoco.core.api.models.entity.Entity; import edu.kit.kastel.mcse.ardoco.tlr.codetraceability.informants.arcotl.NameComparisonUtils; import edu.kit.kastel.mcse.ardoco.tlr.codetraceability.informants.arcotl.computation.Confidence; diff --git a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/ComponentNameResemblanceTest.java b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/ComponentNameResemblanceTest.java index 0913540..1be6eb0 100644 --- a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/ComponentNameResemblanceTest.java +++ b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/ComponentNameResemblanceTest.java @@ -5,12 +5,12 @@ import java.util.SortedSet; import java.util.TreeSet; +import edu.kit.kastel.mcse.ardoco.core.api.entity.Entity; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureComponent; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureInterface; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureItem; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeCompilationUnit; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeItem; -import edu.kit.kastel.mcse.ardoco.core.api.models.entity.Entity; import edu.kit.kastel.mcse.ardoco.core.common.tuple.Pair; import edu.kit.kastel.mcse.ardoco.tlr.codetraceability.informants.arcotl.NameComparisonUtils; import edu.kit.kastel.mcse.ardoco.tlr.codetraceability.informants.arcotl.computation.Confidence; diff --git a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/PackageResemblance.java b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/PackageResemblance.java index 1b9d0d2..34c4018 100644 --- a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/PackageResemblance.java +++ b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/PackageResemblance.java @@ -4,10 +4,10 @@ import java.util.List; import java.util.Objects; +import edu.kit.kastel.mcse.ardoco.core.api.entity.Entity; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureComponent; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureInterface; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeCompilationUnit; -import edu.kit.kastel.mcse.ardoco.core.api.models.entity.Entity; import edu.kit.kastel.mcse.ardoco.tlr.codetraceability.informants.arcotl.NameComparisonUtils; import edu.kit.kastel.mcse.ardoco.tlr.codetraceability.informants.arcotl.computation.Confidence; diff --git a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/PathResemblance.java b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/PathResemblance.java index 2628d53..30a5230 100644 --- a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/PathResemblance.java +++ b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/PathResemblance.java @@ -6,11 +6,11 @@ import java.util.SortedSet; import java.util.TreeSet; +import edu.kit.kastel.mcse.ardoco.core.api.entity.Entity; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureComponent; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureInterface; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeCompilationUnit; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodePackage; -import edu.kit.kastel.mcse.ardoco.core.api.models.entity.Entity; import edu.kit.kastel.mcse.ardoco.tlr.codetraceability.informants.arcotl.NameComparisonUtils; import edu.kit.kastel.mcse.ardoco.tlr.codetraceability.informants.arcotl.computation.Confidence; diff --git a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/ProvidedInterfaceCorrespondence.java b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/ProvidedInterfaceCorrespondence.java index 1bd9d19..cffd1af 100644 --- a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/ProvidedInterfaceCorrespondence.java +++ b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/ProvidedInterfaceCorrespondence.java @@ -5,13 +5,13 @@ import java.util.SortedSet; import java.util.TreeSet; +import edu.kit.kastel.mcse.ardoco.core.api.entity.Entity; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureComponent; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureInterface; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeCompilationUnit; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeModule; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodePackage; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.Datatype; -import edu.kit.kastel.mcse.ardoco.core.api.models.entity.Entity; import edu.kit.kastel.mcse.ardoco.core.common.tuple.Pair; import edu.kit.kastel.mcse.ardoco.tlr.codetraceability.informants.arcotl.NameComparisonUtils; import edu.kit.kastel.mcse.ardoco.tlr.codetraceability.informants.arcotl.computation.Confidence; diff --git a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/Required.java b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/Required.java index 3e11d3b..6d83271 100644 --- a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/Required.java +++ b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/Required.java @@ -4,10 +4,10 @@ import java.util.SortedSet; import java.util.TreeSet; +import edu.kit.kastel.mcse.ardoco.core.api.entity.Entity; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureComponent; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureInterface; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeCompilationUnit; -import edu.kit.kastel.mcse.ardoco.core.api.models.entity.Entity; import edu.kit.kastel.mcse.ardoco.core.common.tuple.Pair; import edu.kit.kastel.mcse.ardoco.tlr.codetraceability.informants.arcotl.computation.Confidence; diff --git a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/SubpackageFilter.java b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/SubpackageFilter.java index c1a2ef3..c7da8ef 100644 --- a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/SubpackageFilter.java +++ b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/SubpackageFilter.java @@ -4,12 +4,12 @@ import java.util.List; import java.util.SortedSet; +import edu.kit.kastel.mcse.ardoco.core.api.entity.Entity; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureComponent; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureInterface; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureItem; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeCompilationUnit; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodePackage; -import edu.kit.kastel.mcse.ardoco.core.api.models.entity.Entity; import edu.kit.kastel.mcse.ardoco.core.common.tuple.Pair; import edu.kit.kastel.mcse.ardoco.tlr.codetraceability.informants.arcotl.NameComparisonUtils; import edu.kit.kastel.mcse.ardoco.tlr.codetraceability.informants.arcotl.computation.Confidence; diff --git a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/SubpackageFilter2.java b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/SubpackageFilter2.java index 9028d9b..65949ea 100644 --- a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/SubpackageFilter2.java +++ b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/arcotl/functions/heuristics/SubpackageFilter2.java @@ -3,11 +3,11 @@ import java.util.SortedSet; +import edu.kit.kastel.mcse.ardoco.core.api.entity.Entity; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureComponent; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureInterface; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureItem; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeCompilationUnit; -import edu.kit.kastel.mcse.ardoco.core.api.models.entity.Entity; import edu.kit.kastel.mcse.ardoco.core.common.tuple.Pair; import edu.kit.kastel.mcse.ardoco.tlr.codetraceability.informants.arcotl.computation.Confidence; diff --git a/stages-tlr/model-provider/src/test/java/edu/kit/kastel/mcse/ardoco/tlr/models/generators/ArchitectureExtractorTest.java b/stages-tlr/model-provider/src/test/java/edu/kit/kastel/mcse/ardoco/tlr/models/generators/ArchitectureExtractorTest.java index 7385c4c..c21b548 100644 --- a/stages-tlr/model-provider/src/test/java/edu/kit/kastel/mcse/ardoco/tlr/models/generators/ArchitectureExtractorTest.java +++ b/stages-tlr/model-provider/src/test/java/edu/kit/kastel/mcse/ardoco/tlr/models/generators/ArchitectureExtractorTest.java @@ -9,11 +9,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import edu.kit.kastel.mcse.ardoco.core.api.entity.Entity; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.ArchitectureModel; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureComponent; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureInterface; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureItem; -import edu.kit.kastel.mcse.ardoco.core.api.models.entity.Entity; import edu.kit.kastel.mcse.ardoco.core.architecture.Deterministic; @Deterministic diff --git a/stages-tlr/model-provider/src/test/java/edu/kit/kastel/mcse/ardoco/tlr/models/generators/java/JavaExtractorTest.java b/stages-tlr/model-provider/src/test/java/edu/kit/kastel/mcse/ardoco/tlr/models/generators/java/JavaExtractorTest.java index 49cad9d..1fb22fe 100644 --- a/stages-tlr/model-provider/src/test/java/edu/kit/kastel/mcse/ardoco/tlr/models/generators/java/JavaExtractorTest.java +++ b/stages-tlr/model-provider/src/test/java/edu/kit/kastel/mcse/ardoco/tlr/models/generators/java/JavaExtractorTest.java @@ -6,9 +6,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import edu.kit.kastel.mcse.ardoco.core.api.entity.Entity; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.CodeModel; import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeItemRepository; -import edu.kit.kastel.mcse.ardoco.core.api.models.entity.Entity; import edu.kit.kastel.mcse.ardoco.tlr.models.connectors.generators.code.java.JavaExtractor; class JavaExtractorTest { diff --git a/stages-tlr/recommendation-generator/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/recommendationgenerator/RecommendedInstanceImpl.java b/stages-tlr/recommendation-generator/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/recommendationgenerator/RecommendedInstanceImpl.java index 33e9860..a67f26b 100644 --- a/stages-tlr/recommendation-generator/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/recommendationgenerator/RecommendedInstanceImpl.java +++ b/stages-tlr/recommendation-generator/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/recommendationgenerator/RecommendedInstanceImpl.java @@ -13,7 +13,7 @@ import org.eclipse.collections.api.set.sorted.ImmutableSortedSet; import org.eclipse.collections.api.set.sorted.MutableSortedSet; -import edu.kit.kastel.mcse.ardoco.core.api.models.entity.Entity; +import edu.kit.kastel.mcse.ardoco.core.api.entity.Entity; import edu.kit.kastel.mcse.ardoco.core.api.recommendationgenerator.RecommendedInstance; import edu.kit.kastel.mcse.ardoco.core.api.text.Word; import edu.kit.kastel.mcse.ardoco.core.api.textextraction.MappingKind; diff --git a/tests/integration-tests/tests-tlr/src/test/java/edu/kit/kastel/mcse/ardoco/tlr/tests/integration/tlrhelper/ModelElementSentenceLink.java b/tests/integration-tests/tests-tlr/src/test/java/edu/kit/kastel/mcse/ardoco/tlr/tests/integration/tlrhelper/ModelElementSentenceLink.java index cb2dfff..5834caa 100644 --- a/tests/integration-tests/tests-tlr/src/test/java/edu/kit/kastel/mcse/ardoco/tlr/tests/integration/tlrhelper/ModelElementSentenceLink.java +++ b/tests/integration-tests/tests-tlr/src/test/java/edu/kit/kastel/mcse/ardoco/tlr/tests/integration/tlrhelper/ModelElementSentenceLink.java @@ -3,7 +3,7 @@ import java.util.Comparator; -import edu.kit.kastel.mcse.ardoco.core.api.models.entity.ArchitectureEntity; +import edu.kit.kastel.mcse.ardoco.core.api.entity.ArchitectureEntity; import edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks.SadSamTraceLink; import edu.kit.kastel.mcse.ardoco.core.api.text.SentenceEntity; import edu.kit.kastel.mcse.ardoco.core.common.Internal;