Move plugin settings to configuration file

Author: oshando

swan_assist/resources/config.properties

@@ -0,0 +1,7 @@
+log_suffix = _swanassist_log.txt
+output_dir_name = output
+output_json_suffix = output.json
+input_json_suffix = config_input.json
+train_dir_name = training_libs
+train_config_file = trainingmethods.json
+swan_jar_name = swan_core.jar

swan_assist/src/de/fraunhofer/iem/swan/assist/actions/LaunchSwanAction.java

@@ -8,10 +8,20 @@
 import com.intellij.util.messages.MessageBus;
 import de.fraunhofer.iem.swan.assist.comm.SwanNotifier;
 import de.fraunhofer.iem.swan.assist.data.JSONFileLoader;
+import de.fraunhofer.iem.swan.assist.data.JSONFileParser;
 import de.fraunhofer.iem.swan.assist.data.JSONWriter;
+import de.fraunhofer.iem.swan.assist.data.MethodWrapper;
 import de.fraunhofer.iem.swan.assist.ui.dialog.SwanLauncherDialog;
+import de.fraunhofer.iem.swan.assist.util.Constants;
 
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Objects;
+import java.util.Properties;
 
 /**
  * Action to start load dialog for configuring SWAN before running.
@@ -28,20 +38,53 @@ public void actionPerformed(AnActionEvent anActionEvent) {
         final Project project = anActionEvent.getRequiredData(CommonDataKeys.PROJECT);
         MessageBus messageBus = project.getMessageBus();
 
-        //Export changes to configuration files
-        JSONWriter exportFile = new JSONWriter();
+        Properties config = new Properties();
+        InputStream input = null;
 
         try {
-            exportFile.writeToJsonFile(JSONFileLoader.getMethods(), JSONFileLoader.getConfigurationFile(true));
+            input = new FileInputStream(getClass().getClassLoader().getResource("").getPath()+"config.properties");
+            config.load(input);
         } catch (IOException e) {
             e.printStackTrace();
+        } finally {
+            if (input != null) {
+                try {
+                    input.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
         }
 
         //Launch Dialog
         SwanLauncherDialog dialog = new SwanLauncherDialog(project, true);
         dialog.show();
 
-        if (dialog.getExitCode()==DialogWrapper.OK_EXIT_CODE) {
+        if (dialog.getExitCode() == DialogWrapper.OK_EXIT_CODE) {
+
+            HashMap<String, String> swanParameters = dialog.getParameters();
+
+            //Merge current list with training methods
+            HashMap<String, MethodWrapper> methods = JSONFileLoader.getAllMethods();
+
+            //Load training methods
+            String trainingFile = Objects.requireNonNull(getClass().getClassLoader().getResource("")).getPath() + config.getProperty("train_config_file");
+            JSONFileParser fileParser = new JSONFileParser(trainingFile);
+            HashMap<String, MethodWrapper> trainingMethods = fileParser.parseJSONFileMap();
+
+            HashMap<String, MethodWrapper> mergedMethods = new HashMap<>(methods);
+            mergedMethods.putAll(trainingMethods);
+
+            //Export changes to configuration files
+            JSONWriter exportFile = new JSONWriter();
+            String newConfigFile = swanParameters.get(Constants.SWAN_OUTPUT_DIR) + File.separator + config.getProperty("input_json_suffix");
+            try {
+                exportFile.writeToJsonFile(new ArrayList<>(mergedMethods.values()), newConfigFile);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+            swanParameters.put(Constants.SWAN_CONFIG_FILE, newConfigFile);
 
             SwanProcessBuilder processBuilder = new SwanProcessBuilder(project, dialog.getParameters());
             processBuilder.start();

swan_assist/src/de/fraunhofer/iem/swan/assist/ui/dialog/SwanResultsDialog.java

@@ -13,10 +13,14 @@
 import javax.swing.filechooser.FileSystemView;
 import java.awt.event.*;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.HashMap;
+import java.util.Properties;
+import java.util.ResourceBundle;
 
 /**
  * Provides results after SWAN finishes executing.
@@ -37,7 +41,26 @@ public class SwanResultsDialog extends DialogWrapper {
     public SwanResultsDialog(Project project, HashMap<String, String> values) {
 
         super(project);
-        setTitle("SWAN Results");
+        ResourceBundle resourceBundle = ResourceBundle.getBundle("dialog_messages");
+        setTitle(resourceBundle.getString("Results.Title"));
+
+        Properties config = new Properties();
+        InputStream input = null;
+
+        try {
+            input = new FileInputStream(getClass().getClassLoader().getResource("").getPath() + "config.properties");
+            config.load(input);
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            if (input != null) {
+                try {
+                    input.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
 
         this.project = project;
 
@@ -68,7 +91,7 @@ public void actionPerformed(ActionEvent actionEvent) {
                     File selectedFile = fileChooser.getSelectedFile();
                     String path = selectedFile.getAbsoluteFile().toString();
                     filePath.setText(path);
-                    logPath.setText(path.replace(Constants.OUTPUT_JSON_SUFFIX, Constants.SWAN_LOG_SUFFIX));
+                    logPath.setText(path.replace(config.getProperty("output_json_suffix"), config.getProperty("log_suffix")));
 
                     try {
                         logText.setText(new String(Files.readAllBytes(Paths.get(logPath.getText()))));
@@ -84,9 +107,6 @@ public void actionPerformed(ActionEvent actionEvent) {
     protected void doOKAction() {
 
         if (isOKActionEnabled()) {
-            MessageBus messageBus = project.getMessageBus();
-            FileSelectedNotifier publisher = messageBus.syncPublisher(FileSelectedNotifier.UPDATED_FILE_NOTIFIER_TOPIC);
-            publisher.notifyFileChange(filePath.getText());
             super.doOKAction();
         }
     }
@@ -95,7 +115,6 @@ protected void doOKAction() {
     @Override
     protected Action[] createActions() {
 
-
         return super.createActions();
     }
 

swan_assist/src/de/fraunhofer/iem/swan/assist/util/Constants.java

@@ -45,17 +45,6 @@ public class Constants {
     public final static String SWAN_OUTPUT_LOG = "output_logs";
     public final static String SWAN_OUTPUT_MESSAGE = "output_message";
 
-    public final static String SWAN_LOG_SUFFIX = "_swanassist_log.txt";
-    public final static String OUTPUT_DIR_NAME = "output";
-    public final static String OUTPUT_JSON_SUFFIX = "output.json";
-    public final static String OUTPUT_TEXT_SUFFIX = "_output.txt";
-
-    public final static String FILTER_CURRENT_FILE_KEY = "file";
-    public final static String FILTER_CURRENT_FILE_VALUE = "Current Class";
-    public final static String FILTER_CURRENT_PROJECT_KEY = "project";
-    public final static String FILTER_CURRENT_PROJECT_VALUE = "Current Project";
-    public final static String FILTER_CLEAR_KEY = "Clear Filters";
-    public final static String FILTER_CLEAR_VALUE = "Clear Filters";
     public final static String FILTER_CWE = "CWE";
     public final static String FILTER_TYPE = "Type";