Refactored notification popup

cmaglie · facchinm · commit 9f6006b92e1f · 2019-03-18T10:35:57.000+01:00
diff --git a/app/src/cc/arduino/view/NotificationPopup.java b/app/src/cc/arduino/view/NotificationPopup.java
@@ -42,6 +42,7 @@
 import java.awt.event.MouseEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
+import java.awt.event.WindowFocusListener;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -55,21 +56,26 @@
 import javax.swing.event.HyperlinkListener;
 
 import cc.arduino.Constants;
+import processing.app.Base;
+import processing.app.Editor;
 import processing.app.Theme;
 
 public class NotificationPopup extends JDialog {
 
   private Timer autoCloseTimer = new Timer(false);
   private boolean autoClose = true;
+  private Editor editor;
 
-  public NotificationPopup(Frame parent, HyperlinkListener hyperlinkListener,
+  public NotificationPopup(Editor parent, HyperlinkListener hyperlinkListener,
                            String message) {
     this(parent, hyperlinkListener, message, true);
+    editor = parent;
   }
 
-  public NotificationPopup(Frame parent, HyperlinkListener hyperlinkListener,
+  public NotificationPopup(Editor parent, HyperlinkListener hyperlinkListener,
                            String message, boolean _autoClose) {
     super(parent, false);
+    editor = parent;
     autoClose = _autoClose;
     setLayout(new FlowLayout());
     setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
@@ -87,7 +93,9 @@ public NotificationPopup(Frame parent, HyperlinkListener hyperlinkListener,
     text.setEditable(false);
     text.setText("<html><body style=\"font-family:sans-serif; font-size: "
                  + scale(14) + ";\">  " + message + "  </body></html>");
-    text.addHyperlinkListener(hyperlinkListener);
+    if (hyperlinkListener != null) {
+      text.addHyperlinkListener(hyperlinkListener);
+    }
     add(text);
 
     Image close = Theme.getThemeImage("close", this, scale(22), scale(22));
@@ -159,4 +167,28 @@ public void run() {
     }
     setVisible(true);
   }
+
+  public void beginWhenFocused() {
+    if (editor.isFocused()) {
+      begin();
+      return;
+    }
+    Base base = editor.getBase();
+
+    // If the IDE is not focused wait until it is focused again to
+    // display the notification, this avoids the annoying side effect
+    // to "steal" the focus from another application.
+    WindowFocusListener wfl = new WindowFocusListener() {
+      @Override
+      public void windowLostFocus(WindowEvent evt) {
+      }
+
+      @Override
+      public void windowGainedFocus(WindowEvent evt) {
+        begin();
+        base.getEditors().forEach(e -> e.removeWindowFocusListener(this));
+      }
+    };
+    base.getEditors().forEach(e -> e.addWindowFocusListener(wfl));
+  }
 }
diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
@@ -401,6 +401,10 @@ public void windowDeactivated(WindowEvent e) {
     EditorConsole.setCurrentEditorConsole(console);
   }
 
+  public Base getBase() {
+    return base;
+  }
+
   /**
    * Handles files dragged & dropped from the desktop and into the editor
    * window. Dragging files into the editor window is the same as using
diff --git a/app/src/processing/app/NewBoardListener.java b/app/src/processing/app/NewBoardListener.java
@@ -73,34 +73,11 @@ public void checkForNewBoardAttached() {
     }
 
     SwingUtilities.invokeLater(() -> {
-
       ed = base.getActiveEditor();
       NotificationPopup notificationPopup = new NotificationPopup(ed, 
                  new UpdatableBoardsLibsFakeURLsHandler(base), 
                  newBoardManagerLink, false);
-      if (ed.isFocused()) {
-        notificationPopup.begin();
-        return;
-      }
-
-      // If the IDE is not focused wait until it is focused again to
-      // display the notification, this avoids the annoying side effect
-      // to "steal" the focus from another application.
-      WindowFocusListener wfl = new WindowFocusListener() {
-        @Override
-        public void windowLostFocus(WindowEvent evt) {
-        }
-
-        @Override
-        public void windowGainedFocus(WindowEvent evt) {
-          notificationPopup.begin();
-          for (Editor e : base.getEditors())
-            e.removeWindowFocusListener(this);
-        }
-      };
-
-      for (Editor e : base.getEditors())
-        e.addWindowFocusListener(wfl);
+      notificationPopup.beginWhenFocused();
     });
   }
 }
