Update UI to support suggesting methods

Author: oshando

swan_assist/build.gradle

@@ -14,7 +14,7 @@ repositories {
 
 dependencies {
     compile group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1'
-    compile group:'de.upb.cs.swt', name: 'swan_core', version: '1.3.0'
+    compile group:'de.upb.cs.swt', name: 'swan_core', version: '1.2.1'
     compile group: 'ca.mcgill.sable', name: 'soot', version: '3.3.0'
     compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.5'
     compile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.5'

swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/ui/MethodListTree.java

@@ -69,6 +69,7 @@ public class MethodListTree extends Tree {
     private String currentFile;
     public static ArrayList<Pair<String, String>> TREE_FILTERS;
     public static boolean RESTORE_METHOD;
+    public static Set<String> suggestedMethodsList;
     private Project project;
     private ResourceBundle resource;
 
@@ -96,6 +97,9 @@ public MethodListTree(Project project) {
         RESTORE_METHOD = false;
         currentFile = "";
 
+
+        suggestedMethodsList = new HashSet<>();
+
         addMouseListener(new MouseAdapter() {
             @Override
             public void mouseClicked(MouseEvent e) {
@@ -241,12 +245,26 @@ public void addNewExistingMethod(MethodWrapper newMethod) {
             }
 
             @Override
-            public void afterAction(ArrayList<MethodWrapper> methods) {
+            public void afterSuggestAction(ArrayList<MethodWrapper> methods) {
+
+                HashMap<String, MethodWrapper> suggestedMethods = new HashMap<>();
 
                 for (MethodWrapper method : methods) {
                     JSONFileLoader.addMethod(method);
                     addNode(method);
+                    suggestedMethods.put(method.getSignature(true), method);
                 }
+
+                TrainingFileManager trainingFileManager = new TrainingFileManager(project);
+
+                if(trainingFileManager.exportNew(suggestedMethods, PropertiesComponent.getInstance(project).getValue(Constants.SWAN_OUTPUT_DIR))){
+
+                    PropertiesComponent.getInstance(project).setValue(Constants.TRAIN_FILE_SUGGESTED,trainingFileManager.getTrainingFile());
+
+                    NotificationType notificationType = NotificationType.INFORMATION;
+                    Notifications.Bus.notify(new Notification(Constants.PLUGIN_GROUP_DISPLAY_ID, resource.getString("Messages.Title.Suggest.NewTrainingFile"), PropertiesComponent.getInstance(project).getValue(Constants.TRAIN_FILE_SUGGESTED), notificationType));
+                }
+
                 DaemonCodeAnalyzer.getInstance(project).restart();
             }
 

swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/ui/dialog/MethodDialog.form

@@ -11,7 +11,9 @@
       <grid id="e3588" layout-manager="GridLayoutManager" row-count="3" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="1" column="0" row-span="1" col-span="5" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="1" column="0" row-span="1" col-span="5" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
+            <minimum-size width="300" height="-1"/>
+          </grid>
         </constraints>
         <properties/>
         <border type="none"/>

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

@@ -14,7 +14,6 @@
 import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.util.messages.MessageBus;
 import de.fraunhofer.iem.swan.assist.comm.MethodNotifier;
-import de.fraunhofer.iem.swan.assist.comm.SuggestedNotifier;
 import de.fraunhofer.iem.swan.assist.data.MethodWrapper;
 import de.fraunhofer.iem.swan.assist.ui.CategoryRenderer;
 import de.fraunhofer.iem.swan.data.Category;
@@ -283,8 +282,8 @@ protected void doOKAction() {
                 if (categorySelected) {
                     MessageBus messageBus = project.getMessageBus();
 
-                    SuggestedNotifier publisher = messageBus.syncPublisher(SuggestedNotifier.METHOD_SUGGESTED_TOPIC);
-                    publisher.afterAction(new ArrayList<>(methods.values()));
+                    MethodNotifier publisher = messageBus.syncPublisher(MethodNotifier.ADD_UPDATE_DELETE_METHOD);
+                    publisher.afterSuggestAction(new ArrayList<>(methods.values()));
                     super.doOKAction();
                 }
             } else if (method.getCategories().size() == 0) {
@@ -294,8 +293,8 @@ protected void doOKAction() {
                 //Notify Summary Tool window that new method was added
                 MessageBus messageBus = project.getMessageBus();
 
-                MethodNotifier publisher = messageBus.syncPublisher(MethodNotifier.METHOD_UPDATED_ADDED_TOPIC);
-                publisher.afterAction(method);
+                MethodNotifier publisher = messageBus.syncPublisher(MethodNotifier.ADD_UPDATE_DELETE_METHOD);
+                publisher.addNewExistingMethod(method);
 
                 super.doOKAction();
             }