Merge pull request #79 from rohithsh/develop

Replace deprecated NotificationGroup and ContentFactory methods

Author: oshando

dev-assist/src/main/java/de/fraunhofer/iem/devassist/actions/ExportAction.java

@@ -28,9 +28,6 @@
  */
 
 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.
      *
@@ -72,8 +69,9 @@ public void actionPerformed(@NotNull AnActionEvent anActionEvent) {
             try {
                 exportFile.writeToJsonFile(JSONFileLoader.getMethods(), filePath);
 
-                Notification analysisCompleted = TOOL_GROUP.createNotification("", JSONFileLoader.getMethods().size() + " methods exported to: " + filePath, NotificationType.INFORMATION);
-                Notifications.Bus.notify(analysisCompleted, project);
+                String notificationContent = JSONFileLoader.getMethods().size() + " methods exported to: " + filePath;
+                NotificationGroupManager.getInstance().getNotificationGroup("Process_Completed").createNotification(notificationContent, NotificationType.INFORMATION).notify(project);
+
 
             } catch (IOException e) {
                 e.printStackTrace();

dev-assist/src/main/java/de/fraunhofer/iem/devassist/ui/MethodListTree.java

@@ -71,8 +71,6 @@ 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
@@ -377,8 +375,8 @@ public void launchSwan(HashMap<String, String> values) {
 
                 JSONFileLoader.setReloading(false);
 
-                Notification analysisCompleted = TOOL_GROUP.createNotification("", "SRM List updated", NotificationType.INFORMATION);
-                Notifications.Bus.notify(analysisCompleted, project);
+                String notificationContent = "SRM List updated";
+                NotificationGroupManager.getInstance().getNotificationGroup("Process_Completed").createNotification(notificationContent, NotificationType.INFORMATION).notify(project);
 
                 ConfigurationFileNotifier fileNotifier = bus.syncPublisher(ConfigurationFileNotifier.FILE_NOTIFIER_TOPIC);
                 fileNotifier.loadUpdatedFile(values.get(Constants.OUTPUT_FILE));
@@ -389,10 +387,8 @@ public void launchSwan(HashMap<String, String> values) {
         bus.connect().subscribe(SecucheckNotifier.END_SECUCHECK_PROCESS_TOPIC, new SecucheckNotifier() {
             @Override
             public void launchSecuCheck() {
-                Notification analysisCompleted = TOOL_GROUP.createNotification("",
-                        "SecuCheck results exported to "+PropertiesComponent.getInstance(project).getValue(Constants.OUTPUT_DIRECTORY),
-                        NotificationType.INFORMATION);
-                Notifications.Bus.notify(analysisCompleted, project);
+                String notificationContent = "SecuCheck results exported to "+PropertiesComponent.getInstance(project).getValue(Constants.OUTPUT_DIRECTORY);
+                NotificationGroupManager.getInstance().getNotificationGroup("Process_Completed").createNotification(notificationContent, NotificationType.INFORMATION).notify(project);
             }
         });
 

dev-assist/src/main/java/de/fraunhofer/iem/devassist/ui/SummaryToolWindow.java

@@ -69,7 +69,7 @@ public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindo
         }
 
         //Add Content to ToolWindow
-        ContentFactory contentFactory = ContentFactory.SERVICE.getInstance();
+        ContentFactory contentFactory = ContentFactory.getInstance();
         Content toolContent = contentFactory.createContent(toolPanel, "", false);
         toolWindow.getContentManager().addContent(toolContent);
     }

dev-assist/src/main/resources/META-INF/plugin.xml

@@ -22,6 +22,7 @@
         <codeInsight.lineMarkerProvider language="JAVA"
                                         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"/>
     </extensions>
 
     <actions>