From 91cffdf30d4026759159164ac741fde3f0eaec9e Mon Sep 17 00:00:00 2001
From: AdamZsofi <adamzsofi.mail@gmail.com>
Date: Sun, 7 Nov 2021 22:03:24 +0100
Subject: [PATCH] Cleaned up deprecated xcfa-utils module

---
 settings.gradle.kts                                 |  1 -
 subprojects/xcfa/xcfa-analysis/build.gradle.kts     |  1 -
 subprojects/xcfa/xcfa-cli/build.gradle.kts          |  1 -
 .../bme/mit/theta/xcfa/cli/stateless/XcfaCli.java   | 13 +++----------
 subprojects/xcfa/xcfa-utils/build.gradle.kts        | 11 -----------
 5 files changed, 3 insertions(+), 24 deletions(-)
 delete mode 100644 subprojects/xcfa/xcfa-utils/build.gradle.kts

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 34be5a3adc..c396532d6b 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -18,7 +18,6 @@ include(
         "xcfa/xcfa-analysis",
         "xcfa/xcfa-cli",
         "xcfa/cat",
-        "xcfa/xcfa-utils",
 
         "xta/xta",
         "xta/xta-analysis",
diff --git a/subprojects/xcfa/xcfa-analysis/build.gradle.kts b/subprojects/xcfa/xcfa-analysis/build.gradle.kts
index 7a72bbf2c0..48972893da 100644
--- a/subprojects/xcfa/xcfa-analysis/build.gradle.kts
+++ b/subprojects/xcfa/xcfa-analysis/build.gradle.kts
@@ -9,5 +9,4 @@ dependencies {
     compile(project(":theta-cat"))
     compile(project(":theta-common"))
     compile(project(":theta-solver-smtlib"))
-    compile(project(":theta-xcfa-utils"))
 }
diff --git a/subprojects/xcfa/xcfa-cli/build.gradle.kts b/subprojects/xcfa/xcfa-cli/build.gradle.kts
index 42634958ea..1f3d795a28 100644
--- a/subprojects/xcfa/xcfa-cli/build.gradle.kts
+++ b/subprojects/xcfa/xcfa-cli/build.gradle.kts
@@ -6,7 +6,6 @@ plugins {
 dependencies {
     compile(project(":theta-xcfa"))
     compile(project(":theta-xcfa-analysis"))
-    compile(project(":theta-xcfa-utils"))
     compile(project(":theta-solver-z3"))
     compile(project(":theta-cfa-analysis"))
     compile(project(":theta-cfa"))
diff --git a/subprojects/xcfa/xcfa-cli/src/main/java/hu/bme/mit/theta/xcfa/cli/stateless/XcfaCli.java b/subprojects/xcfa/xcfa-cli/src/main/java/hu/bme/mit/theta/xcfa/cli/stateless/XcfaCli.java
index 3ab1e4d6fa..6b7d6d4051 100644
--- a/subprojects/xcfa/xcfa-cli/src/main/java/hu/bme/mit/theta/xcfa/cli/stateless/XcfaCli.java
+++ b/subprojects/xcfa/xcfa-cli/src/main/java/hu/bme/mit/theta/xcfa/cli/stateless/XcfaCli.java
@@ -50,9 +50,6 @@
 import hu.bme.mit.theta.xcfa.analysis.algorithmselection.SequentialPortfolio;
 import hu.bme.mit.theta.xcfa.analysis.common.XcfaConfig;
 import hu.bme.mit.theta.xcfa.analysis.common.XcfaConfigBuilder;
-import hu.bme.mit.theta.xcfa.analysis.declarative.XcfaDeclarativeAction;
-import hu.bme.mit.theta.xcfa.analysis.declarative.XcfaDeclarativeState;
-import hu.bme.mit.theta.xcfa.analysis.utils.XcfaTraceConcretizer;
 import hu.bme.mit.theta.xcfa.model.XCFA;
 import hu.bme.mit.theta.xcfa.model.utils.FrontendXcfaBuilder;
 import hu.bme.mit.theta.xcfa.analysis.utils.OutputHandler;
@@ -100,12 +97,8 @@ public class XcfaCli {
 	@Parameter(names = "--no-analysis", description = "Executes the model transformation to XCFA and CFA, and then exits; use with --output-results to get data about the (X)CFA")
 	boolean noAnalysis = false;
 
-	File cexfile = null;
-	File witnessfile = null;
-	File dotwitnessfile = null;
-	File highlightedxcfafile = null;
-	File cfafile = null;
-	File xcfafile = null;
+	File cexfile = null; // for legacy cfa only
+	File cfafile = null; // for legacy cfa only
 
 	//////////// arithmetic types allowed ////////////
 
@@ -390,7 +383,7 @@ private void executeSingleConfiguration(XCFA xcfa) throws Exception {
 		SafetyResult<?, ?> status = check(configuration);
 		if (status!=null && status.isUnsafe()) {
 			OutputHandler.getInstance().writeCounterexamples(status, refinementSolver);
-		} else if(status!=null && status.isSafe() && witnessfile!=null) {
+		} else if(status!=null && status.isSafe()) {
 			OutputHandler.getInstance().writeDummyCorrectnessWitness();
 		}
 	}
diff --git a/subprojects/xcfa/xcfa-utils/build.gradle.kts b/subprojects/xcfa/xcfa-utils/build.gradle.kts
deleted file mode 100644
index 6ae4b9be49..0000000000
--- a/subprojects/xcfa/xcfa-utils/build.gradle.kts
+++ /dev/null
@@ -1,11 +0,0 @@
-plugins {
-    id("java-common")
-}
-
-dependencies {
-    compile(project(":theta-xcfa"))
-    compile(project(":theta-common"))
-    compile(project(":theta-core"))
-    compile(project(":theta-solver"))
-    compile(project(":theta-solver-z3"))
-}