Replace dialog messages with popups

Author: oshando

src/de/fraunhofer/iem/mois/assist/actions/ExportAction.java

@@ -41,7 +41,7 @@ public void actionPerformed(AnActionEvent anActionEvent) {
             }
 
             JSONWriter exportFile = new JSONWriter();
-
+            //TODO deal with exception
             try {
                 exportFile.writeToJsonFile(JSONFileLoader.getMethods(), filePath);
             } catch (IOException e) {

src/de/fraunhofer/iem/mois/assist/actions/LaunchMoisAction.java

@@ -33,21 +33,20 @@ public void actionPerformed(AnActionEvent anActionEvent) {
         //Export changes to configuration files
         JSONWriter exportFile = new JSONWriter();
 
-      /*  try {
+        try {
             exportFile.writeToJsonFile(JSONFileLoader.getMethods(), JSONFileLoader.getConfigurationFile(true));
         } catch (IOException e) {
             e.printStackTrace();
-        }*/
+        }
 
         //Launch Dialog
-        Window activeWindow = FocusManager.getCurrentManager().getActiveWindow();
+        MoisLauncherDialog dialog = new MoisLauncherDialog(project, true);
+        dialog.show();
 
-        MoisLauncherDialog dialog = new MoisLauncherDialog(activeWindow, project, true);
-        dialog.pack();
-        dialog.setLocationRelativeTo(null);
-        dialog.setVisible(true);
+        if (dialog.getExitCode()==DialogWrapper.OK_EXIT_CODE) {
 
-        if (dialog.isConfirmed()) {
+            MoisProcessBuilder processBuilder = new MoisProcessBuilder(project, dialog.getParameters());
+            processBuilder.start();
 
             MoisNotifier publisher = messageBus.syncPublisher(MoisNotifier.START_MOIS_PROCESS_TOPIC);
             publisher.launchMois(null);
@@ -58,7 +57,9 @@ public void actionPerformed(AnActionEvent anActionEvent) {
     public void update(AnActionEvent event) {
 
         //Disable/Enable action button
-        if (JSONFileLoader.isFileSelected())
+        if (JSONFileLoader.isReloading() || !JSONFileLoader.isFileSelected())
+            event.getPresentation().setEnabled(false);
+        else
             event.getPresentation().setEnabled(true);
     }
 }

src/de/fraunhofer/iem/mois/assist/actions/MoisProcessBuilder.java

@@ -16,6 +16,7 @@
 
 /**
  * Creates process to run MOIS.
+ *
  * @author Oshando Johnson
  */
 
@@ -24,11 +25,11 @@
 public class MoisProcessBuilder extends Thread {
 
     private static HashMap<String, String> parameters;
-    private AnActionEvent anActionEvent;
+    private Project project;
 
-    MoisProcessBuilder(AnActionEvent actionEvent, HashMap<String, String> param) {
+    MoisProcessBuilder(Project project, HashMap<String, String> param) {
 
-        anActionEvent = actionEvent;
+        this.project = project;
         parameters = param;
     }
 
@@ -57,15 +58,14 @@ public void run() {
         processBuilder.redirectErrorStream(true);
         processBuilder.redirectOutput(ProcessBuilder.Redirect.appendTo(logFile));
 
-        String completionTimestamp = getCurrentTimestamp("HH:mm");
-        String message = Constants.NOTIFICATION_END_MOIS_SUCCESS + completionTimestamp;
+        String message;
 
         try {
             Process moisProcess = processBuilder.start();
             int result = moisProcess.waitFor();
 
             if (result == 0)
-                message = Constants.NOTIFICATION_END_MOIS_SUCCESS + completionTimestamp;
+                message = Constants.NOTIFICATION_END_MOIS_SUCCESS;
             else
                 message = Constants.NOTIFICATION_END_MOIS_FAIL;
 
@@ -76,13 +76,10 @@ public void run() {
         }
 
         HashMap<String, String> results = new HashMap<String, String>();
-        results.put(Constants.MOIS_OUTPUT_FILE, parameters.get(Constants.MOIS_OUTPUT_DIR) + File.separator + currentTimestamp + Constants.OUTPUT_JSON_SUFFIX);
+        results.put(Constants.MOIS_OUTPUT_FILE, parameters.get(Constants.MOIS_OUTPUT_DIR) + File.separator + "json" + File.separator + Constants.OUTPUT_JSON_SUFFIX);
         results.put(Constants.MOIS_OUTPUT_LOG, parameters.get(Constants.MOIS_OUTPUT_DIR) + File.separator + currentTimestamp + Constants.MOIS_LOG_SUFFIX);
         results.put(Constants.MOIS_OUTPUT_MESSAGE, message);
 
-        anActionEvent.getPresentation().setEnabled(true);
-
-        final Project project = anActionEvent.getRequiredData(CommonDataKeys.PROJECT);
         MessageBus messageBus = project.getMessageBus();
         MoisNotifier publisher = messageBus.syncPublisher(MoisNotifier.END_MOIS_PROCESS_TOPIC);
         publisher.launchMois(results);

src/de/fraunhofer/iem/mois/assist/actions/method/MethodPropertiesAction.java

@@ -53,12 +53,8 @@ public void actionPerformed(AnActionEvent anActionEvent) {
             method = PsiTraversal.getMethodAtOffset(anActionEvent, false);
 
         if (method != null) {
-            MethodPropertiesDialog detailsDialog = new MethodPropertiesDialog(method);
-            detailsDialog.setTitle(Constants.TITLE_METHOD_PROPERTIES);
-            detailsDialog.pack();
-            detailsDialog.setSize(550, 350);
-            detailsDialog.setLocationRelativeTo(null);
-            detailsDialog.setVisible(true);
+            MethodPropertiesDialog detailsDialog = new MethodPropertiesDialog(project, method);
+            detailsDialog.show();
         } else {
             final Editor editor = anActionEvent.getRequiredData(CommonDataKeys.EDITOR);
             JBPopupFactory.getInstance().createHtmlTextBalloonBuilder(Constants.METHOD_NOT_FOUND, MessageType.INFO, null)

src/de/fraunhofer/iem/mois/assist/actions/method/UpdateMethodAction.java

@@ -28,16 +28,7 @@ public void actionPerformed(AnActionEvent anActionEvent) {
         final Project project = anActionEvent.getProject();
 
         MethodDialog dialog = new MethodDialog(method, project, JSONFileLoader.getCategories());
-
-        if (method.isNewMethod())
-            dialog.setTitle(Constants.TITLE_ADD_METHOD);
-        else
-            dialog.setTitle(Constants.TITLE_UPDATE_METHOD);
-
-        dialog.pack();
-        dialog.setSize(550, 350);
-        dialog.setLocationRelativeTo(null);
-        dialog.setVisible(true);
+        dialog.show();
     }
 
     @Override

src/de/fraunhofer/iem/mois/assist/data/JSONFileLoader.java

@@ -16,6 +16,10 @@ public class JSONFileLoader {
     static public final int NEW_METHOD = 0;
     static public final int EXISTING_METHOD = 1;
 
+
+
+    static private boolean reloadingMois = false;
+
     //Get configuration file location
     public static void setConfigurationFile(String path) {
 
@@ -150,4 +154,12 @@ private static boolean inProject(String classname, Project project) {
         //psiClass.getAllMethods()[0].
         return psiClass != null;
     }
+
+    public static boolean isReloading() {
+        return reloadingMois;
+    }
+
+    public static void setReloading(boolean reloadingMois) {
+        JSONFileLoader.reloadingMois = reloadingMois;
+    }
 }

src/de/fraunhofer/iem/mois/assist/data/JSONFileParser.java

@@ -1,8 +1,11 @@
 package de.fraunhofer.iem.mois.assist.data;
 
-import com.intellij.openapi.ui.Messages;
+import com.intellij.notification.Notification;
+import com.intellij.notification.NotificationType;
+import com.intellij.notification.Notifications;
 import de.fraunhofer.iem.mois.Parser;
 import de.fraunhofer.iem.mois.assist.util.Constants;
+import de.fraunhofer.iem.mois.data.Method;
 
 import java.util.HashMap;
 
@@ -29,13 +32,13 @@ public HashMap<String, MethodWrapper> parseJSONFileMap() {
         Parser parser = new Parser(null);
 
         try {
-            for (de.fraunhofer.iem.mois.data.Method method : parser.parseFile(congFilePath)) {
+            for (Method method : parser.parseFile(congFilePath)) {
 
                 MethodWrapper methodWrapper = new MethodWrapper(method);
                 methods.put(methodWrapper.getSignature(true),methodWrapper );
             }
         } catch (Exception e) {
-            Messages.showWarningDialog(Constants.FILE_LOAD_ERROR, "File Load Error");
+            Notifications.Bus.notify(new Notification("AssistMois", "File Load Error", Constants.FILE_LOAD_ERROR, NotificationType.ERROR));
         }
 
         return methods;