[fact] Convert Spoon3dmMerge to Kotlin (#164)

ASSERT-KTH · Feb 23, 2021 · a7393e4 · a7393e4
1 parent d35fced
commit a7393e4
Show file tree

Hide file tree

Showing 5 changed files with 357 additions and 367 deletions.
diff --git a/src/main/java/se/kth/spork/cli/Cli.java b/src/main/java/se/kth/spork/cli/Cli.java
@@ -207,7 +207,7 @@ public static Pair<String, Integer> merge(
 
             LOGGER.info(() -> "Initiating merge");
             Pair<CtElement, Integer> merge =
-                    Spoon3dmMerge.merge(baseModule, leftModule, rightModule);
+                    Spoon3dmMerge.INSTANCE.merge(baseModule, leftModule, rightModule);
             CtModule mergeTree = (CtModule) merge.first;
             int numConflicts = merge.second;
 

diff --git a/src/main/java/se/kth/spork/spoon/Spoon3dmMerge.java b/src/main/java/se/kth/spork/spoon/Spoon3dmMerge.java