Refactoring

Author: mikkomaran

src/main/java/ee/ut/similaritydetector/backend/SolutionParser.java

@@ -19,6 +19,7 @@
 
 public class SolutionParser {
 
+    public static final String outputDirectoryPath = "resources/";
     private final File contentDirectory;
     private final File outputDirectory;
     private final boolean preprocessSourceCode;
@@ -28,7 +29,8 @@ public class SolutionParser {
 
     public SolutionParser(File contentDirectory, boolean preprocessSourceCode, boolean anonymousResults, Analyser analyser) {
         this.contentDirectory = contentDirectory;
-        this.outputDirectory = new File("resources/");
+        this.outputDirectory = new File(outputDirectoryPath);
+        System.out.println(outputDirectory.getAbsolutePath());
         this.preprocessSourceCode = preprocessSourceCode;
         this.anonymousResults = anonymousResults;
         this.analyser = analyser;
@@ -167,6 +169,4 @@ public void preprocessSourceCode2(String filePath) throws Exception {
         interpreter.execfile(getClass().getResourceAsStream(preprocessorScript));
     }
 
-
-
 }

src/main/java/ee/ut/similaritydetector/ui/SimilarityDetectorLauncher.java

@@ -18,6 +18,8 @@
 import java.net.URL;
 import java.util.Optional;
 
+import static ee.ut.similaritydetector.backend.SolutionParser.outputDirectoryPath;
+
 public class SimilarityDetectorLauncher extends Application {
 
     public static void main(String[] args) {
@@ -90,8 +92,12 @@ private void showExitConfirmationAlert(WindowEvent windowEvent) {
      * Deletes the files that are generated during runtime for analysis.
      */
     public static void deleteOutputFiles() {
-        File outputDirectory = new File("resources/");
-        deleteDirectory(outputDirectory);
+        Platform.runLater(() -> {
+            File outputDirectory = new File(outputDirectoryPath);
+            if (deleteDirectory(outputDirectory)) {
+                System.out.println("Deleted analysis files.");
+            }
+        });
     }
 
     /**
@@ -100,7 +106,7 @@ public static void deleteOutputFiles() {
      *
      * @param directory the directory to delete
      */
-    private static void deleteDirectory(File directory) {
+    private static boolean deleteDirectory(File directory) {
         File[] files = directory.listFiles();
         if(files != null) {
             for(File f : files) {
@@ -111,7 +117,7 @@ private static void deleteDirectory(File directory) {
                 }
             }
         }
-        directory.delete();
+        return directory.delete();
     }
 
     /**

src/main/java/ee/ut/similaritydetector/ui/controllers/ResultsViewController.java

@@ -16,6 +16,7 @@
 
 import java.io.IOException;
 
+import static ee.ut.similaritydetector.ui.SimilarityDetectorLauncher.deleteOutputFiles;
 import static ee.ut.similaritydetector.ui.utils.AlertUtils.showAndWaitAlert;
 
 public class ResultsViewController {
@@ -188,7 +189,7 @@ private void openMainView() throws IOException {
         MainViewController.stage.setScene(scene);
         // Icon from: https://icons-for-free.com/spy-131964785010048699/ [25.03.2021]
         MainViewController.stage.getIcons().add(new Image(getClass().getResourceAsStream("/ee/ut/similaritydetector/img/app_icon.png")));
-
+        deleteOutputFiles();
         mainViewController.openOptions();
         MainViewController.stage.show();
     }