Update SRM completion notification type and text

oshando · oshando · commit 8614e60a913f · 2024-05-07T10:14:17.000+02:00
diff --git a/dev-assist/src/main/java/de/fraunhofer/iem/devassist/analysis/SwanBackgroundTask.java b/dev-assist/src/main/java/de/fraunhofer/iem/devassist/analysis/SwanBackgroundTask.java
@@ -21,9 +21,7 @@
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 public class SwanBackgroundTask extends Task.Backgroundable {
 
@@ -61,9 +59,8 @@ public void run(@NotNull ProgressIndicator indicator) {
             throw new RuntimeException(e);
         }
 
-        duration = System.currentTimeMillis() - start;
-        int m = (int) (((duration / 1000) / 60) % 60);
-        int s = (int) ((duration / 1000) % 60);
+        duration = (int) ((System.currentTimeMillis() - start)/ 1000);
+
 
         indicator.setText("Exporting SRMs");
         String filename = Objects.requireNonNull(PropertiesComponent.getInstance(project).getValue(Constants.OUTPUT_DIRECTORY)) + File.separator + "srm-" + getCurrentTimestamp() + ".json";
@@ -80,8 +77,13 @@ public void run(@NotNull ProgressIndicator indicator) {
 
         PropertiesComponent.getInstance(project).setValue(Constants.LAST_SRM_LIST, filename);
         results.put(Constants.OUTPUT_FILE, filename);
+        File outputFile = new File(filename);
+
         results.put(Constants.OUTPUT_LOG, "");
-        results.put(Constants.ANALYSIS_RESULT, srmList.getMethods().size() + " methods found in " + m + " mins " + s + " secs");
+        results.put(Constants.ANALYSIS_RESULT,
+                srmList.getMethods().stream().filter(n -> !n.isKnown()).count()
+                        + " SRMs found in " + duration + "s and exported to "
+                        + outputFile.getName());
 
         MessageBus messageBus = project.getMessageBus();
         SwanNotifier publisher = messageBus.syncPublisher(SwanNotifier.END_SWAN_PROCESS_TOPIC);
diff --git a/dev-assist/src/main/java/de/fraunhofer/iem/devassist/ui/MethodListTree.java b/dev-assist/src/main/java/de/fraunhofer/iem/devassist/ui/MethodListTree.java
@@ -375,8 +375,10 @@ public void launchSwan(HashMap<String, String> values) {
 
                 JSONFileLoader.setReloading(false);
 
-                String notificationContent = "SRM List updated";
-                NotificationGroupManager.getInstance().getNotificationGroup("Process_Completed").createNotification(notificationContent, NotificationType.INFORMATION).notify(project);
+                NotificationGroupManager.getInstance()
+                        .getNotificationGroup("SRM Notification")
+                        .createNotification(values.get(Constants.ANALYSIS_RESULT), NotificationType.INFORMATION)
+                        .notify(project);
 
                 ConfigurationFileNotifier fileNotifier = bus.syncPublisher(ConfigurationFileNotifier.FILE_NOTIFIER_TOPIC);
                 fileNotifier.loadUpdatedFile(values.get(Constants.OUTPUT_FILE));
@@ -585,7 +587,7 @@ private void loadMethods() {
                     if (method.getMethod().isKnown()) {
                         method.setTrainingMethod(true);
                         standardSrms.add(classNode);
-                    }else{
+                    } else {
                         currentProject.add(classNode);
                     }
                 }
@@ -597,7 +599,7 @@ private void loadMethods() {
             currentProject.setUserObject("<html><b>" + project.getName() + "</b> <font color='gray'>(" + currentProject.getLeafCount() + " in " + currentProject.getChildCount() + " classes)</font></html>");
             root.add(currentProject);
 
-            standardSrms.setUserObject("<html><b>Known SRMs</b> <font color='gray'>(" + standardSrms.getLeafCount() + " in " + standardSrms.getChildCount()+ " classes)</font></html>");
+            standardSrms.setUserObject("<html><b>Known SRMs</b> <font color='gray'>(" + standardSrms.getLeafCount() + " in " + standardSrms.getChildCount() + " classes)</font></html>");
             root.add(standardSrms);
 
             treeModel.setRoot(root);
diff --git a/dev-assist/src/main/resources/META-INF/plugin.xml b/dev-assist/src/main/resources/META-INF/plugin.xml
@@ -23,6 +23,7 @@
                                         implementationClass="de.fraunhofer.iem.devassist.ui.markers.ErrorLineMarker"/>
         <toolWindow id="Dev-Assist" anchor="right" factoryClass="de.fraunhofer.iem.devassist.ui.SummaryToolWindow" icon="PluginIcons.DEV_ASSIST"/>
         <notificationGroup id="Process_Completed" displayType="TOOL_WINDOW"/>
+        <notificationGroup id="SRM Notification" displayType="BALLOON"/>
     </extensions>
 
     <actions>
