Update plugin notifications

oshando · oshando · commit 2a96297cc56e · 2022-09-17T21:42:25.000+02:00
diff --git a/swan-assist/src/main/java/de/fraunhofer/iem/swan/assist/actions/ExportAction.java b/swan-assist/src/main/java/de/fraunhofer/iem/swan/assist/actions/ExportAction.java
@@ -7,9 +7,7 @@
 
 package de.fraunhofer.iem.swan.assist.actions;
 
-import com.intellij.notification.Notification;
-import com.intellij.notification.NotificationType;
-import com.intellij.notification.Notifications;
+import com.intellij.notification.*;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
@@ -31,8 +29,11 @@
 
 public class ExportAction extends AnAction {
 
+    private static final NotificationGroup TOOL_GROUP = new NotificationGroup(Constants.PLUGIN_GROUP_DISPLAY_ID,
+            NotificationDisplayType.TOOL_WINDOW, true);
     /**
      * Obtains list of methods and creates new JSON file in the location specified by the user.
+     *
      * @param anActionEvent source event
      */
     @Override
@@ -71,8 +72,8 @@ public void actionPerformed(@NotNull AnActionEvent anActionEvent) {
             try {
                 exportFile.writeToJsonFile(JSONFileLoader.getMethods(), filePath);
 
-                Notifications.Bus.notify(
-                        new Notification(Constants.PLUGIN_GROUP_DISPLAY_ID, "", JSONFileLoader.getMethods().size()+ " methods exported to: "+filePath, NotificationType.INFORMATION));
+                Notification analysisCompleted = TOOL_GROUP.createNotification("", JSONFileLoader.getMethods().size() + " methods exported to: " + filePath, NotificationType.INFORMATION);
+                Notifications.Bus.notify(analysisCompleted, project);
 
             } catch (IOException e) {
                 e.printStackTrace();
@@ -82,6 +83,7 @@ public void actionPerformed(@NotNull AnActionEvent anActionEvent) {
 
     /**
      * Controls whether the action is enabled or disabled
+     *
      * @param event source  event
      */
     @Override
diff --git a/swan-assist/src/main/java/de/fraunhofer/iem/swan/assist/ui/MethodListTree.java b/swan-assist/src/main/java/de/fraunhofer/iem/swan/assist/ui/MethodListTree.java
@@ -9,10 +9,7 @@
 
 import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
 import com.intellij.ide.util.PropertiesComponent;
-import com.intellij.notification.Notification;
-import com.intellij.notification.NotificationListener;
-import com.intellij.notification.NotificationType;
-import com.intellij.notification.Notifications;
+import com.intellij.notification.*;
 import com.intellij.openapi.actionSystem.ActionManager;
 import com.intellij.openapi.actionSystem.ActionPopupMenu;
 import com.intellij.openapi.application.ApplicationManager;
@@ -74,6 +71,9 @@ public class MethodListTree extends Tree {
     private ResourceBundle resource;
     public static boolean TREE_EXPANDED;
 
+    private static final NotificationGroup TOOL_GROUP= new NotificationGroup(Constants.PLUGIN_GROUP_DISPLAY_ID,
+            NotificationDisplayType.TOOL_WINDOW, true);;
+
     /**
      * Initialises method list tree
      *
@@ -297,7 +297,6 @@ public void addNewExistingMethod(MethodWrapper newMethod) {
 
                         break;
                     case JSONFileLoader.NEW_METHOD:
-
                         addNode(newMethod);
                         break;
                 }
@@ -378,10 +377,9 @@ public void launchSwan(HashMap<String, String> values) {
             public void launchSwan(HashMap<String, String> values) {
 
                 JSONFileLoader.setReloading(false);
-                NotificationType notificationType = NotificationType.INFORMATION;
 
-                String message = "<html>"
-                        + values.get(Constants.ANALYSIS_RESULT);
+                Notification analysisCompleted = TOOL_GROUP.createNotification("", "SRM List updated", NotificationType.INFORMATION);
+                Notifications.Bus.notify(analysisCompleted, project);
 
                 ConfigurationFileNotifier fileNotifier = bus.syncPublisher(ConfigurationFileNotifier.FILE_NOTIFIER_TOPIC);
                 fileNotifier.loadUpdatedFile(values.get(Constants.OUTPUT_FILE));
@@ -569,7 +567,7 @@ private void loadMethods() {
 
                 DefaultMutableTreeNode classNode = new DefaultMutableTreeNode(new Pair<>(classname, methodCount));
 
-                ArrayList<MethodWrapper> sortedList =  methods.get(classname);
+                ArrayList<MethodWrapper> sortedList = methods.get(classname);
                 Collections.sort(sortedList);
                 for (MethodWrapper method : sortedList) {
 
@@ -581,7 +579,7 @@ private void loadMethods() {
             String pattern = "###,###";
             DecimalFormat decimalFormat = new DecimalFormat(pattern);
 
-            root.setUserObject("<html><b>SRMs</b> <font color='gray'>(" + decimalFormat.format(totalMethods) + " in "+ decimalFormat.format(methods.size())+" classes)</font></html>");
+            root.setUserObject("<html><b>SRMs</b> <font color='gray'>(" + decimalFormat.format(totalMethods) + " in " + decimalFormat.format(methods.size()) + " classes)</font></html>");
 
             treeModel.setRoot(root);
             TREE_EXPANDED = false;
