Changeset 12766 in josm for trunk

Timestamp:

2017-09-07T00:41:30+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15229 - see #15182 - remove GUI stuff from MessageNotifier

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/MainApplication.java (modified) (7 diffs)
• io/MessageNotifier.java (modified) (5 diffs)
• tools/Logging.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -8 +8 @@
 import java.awt.Dimension;
 import java.awt.GraphicsEnvironment;
+import java.awt.GridBagLayout;
 import java.awt.event.KeyEvent;
 import java.io.File;
@@ -48 +49 @@
 import javax.swing.InputMap;
 import javax.swing.JComponent;
+import javax.swing.JLabel;
 import javax.swing.JOptionPane;
+import javax.swing.JPanel;
 import javax.swing.KeyStroke;
 import javax.swing.LookAndFeel;
@@ -80 +83 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.UserInfo;
 import org.openstreetmap.josm.data.osm.search.SearchMode;
 import org.openstreetmap.josm.data.validation.OsmValidator;
@@ -107 +111 @@
 import org.openstreetmap.josm.gui.util.RedirectInputMap;
 import org.openstreetmap.josm.gui.util.WindowGeometry;
+import org.openstreetmap.josm.gui.widgets.UrlLabel;
 import org.openstreetmap.josm.io.CertificateAmendment;
 import org.openstreetmap.josm.io.DefaultProxySelector;
@@ -122 +127 @@
 import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.tools.FontsManager;
+import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.I18n;
@@ -968 +974 @@
 
     static void setupCallbacks() {
+        MessageNotifier.setNotifierCallback(MainApplication::notifyNewMessages);
         DeleteCommand.setDeletionCallback(DeleteAction.defaultDeletionCallback);
     }
@@ -1307 +1314 @@
         }
     }
+
+    static void notifyNewMessages(UserInfo userInfo) {
+        GuiHelper.runInEDT(() -> {
+            JPanel panel = new JPanel(new GridBagLayout());
+            panel.add(new JLabel(trn("You have {0} unread message.", "You have {0} unread messages.",
+                    userInfo.getUnreadMessages(), userInfo.getUnreadMessages())),
+                    GBC.eol());
+            panel.add(new UrlLabel(Main.getBaseUserUrl() + '/' + userInfo.getDisplayName() + "/inbox",
+                    tr("Click here to see your inbox.")), GBC.eol());
+            panel.setOpaque(false);
+            new Notification().setContent(panel)
+                .setIcon(JOptionPane.INFORMATION_MESSAGE)
+                .setDuration(Notification.TIME_LONG)
+                .show();
+        });
+    }
 }

trunk/src/org/openstreetmap/josm/io/MessageNotifier.java

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.tools.I18n.trn;
 
-import java.awt.GridBagLayout;
 import java.net.Authenticator.RequestorType;
 import java.util.concurrent.Executors;
@@ -12 +10 @@
 import java.util.concurrent.TimeUnit;
 
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.UserIdentityManager;
@@ -21 +15 @@
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
-import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
-import org.openstreetmap.josm.gui.util.GuiHelper;
-import org.openstreetmap.josm.gui.widgets.UrlLabel;
 import org.openstreetmap.josm.io.auth.CredentialsAgentException;
 import org.openstreetmap.josm.io.auth.CredentialsAgentResponse;
 import org.openstreetmap.josm.io.auth.CredentialsManager;
 import org.openstreetmap.josm.io.auth.JosmPreferencesCredentialAgent;
-import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
@@ -41 +31 @@
     private MessageNotifier() {
         // Hide default constructor for utils classes
+    }
+
+    /**
+     * Called when new new messages are detected.
+     * @since xxx
+     */
+    @FunctionalInterface
+    public interface NotifierCallback {
+        /**
+         * Perform the actual notification of new messages.
+         * @param userInfo the new user information, that includes the number of unread messages
+         */
+        void notifyNewMessages(UserInfo userInfo);
+    }
+
+    private static NotifierCallback callback;
+
+    /**
+     * Sets the {@link NotifierCallback} responsible of notifying the user when new messages are received.
+     * @param notifierCallback the new {@code NotifierCallback}
+     */
+    public static void setNotifierCallback(NotifierCallback notifierCallback) {
+        callback = notifierCallback;
     }
 
@@ -71 +84 @@
                     final int unread = userInfo.getUnreadMessages();
                     if (unread > 0 && unread != lastUnreadCount) {
-                        GuiHelper.runInEDT(() -> {
-                            JPanel panel = new JPanel(new GridBagLayout());
-                            panel.add(new JLabel(trn("You have {0} unread message.", "You have {0} unread messages.", unread, unread)),
-                                    GBC.eol());
-                            panel.add(new UrlLabel(Main.getBaseUserUrl() + '/' + userInfo.getDisplayName() + "/inbox",
-                                    tr("Click here to see your inbox.")), GBC.eol());
-                            panel.setOpaque(false);
-                            new Notification().setContent(panel)
-                                .setIcon(JOptionPane.INFORMATION_MESSAGE)
-                                .setDuration(Notification.TIME_LONG)
-                                .show();
-                        });
+                        callback.notifyNewMessages(userInfo);
                         lastUnreadCount = unread;
                     }

trunk/src/org/openstreetmap/josm/tools/Logging.java

@@ -283 +283 @@
     }
 
-
     private static void logPrivate(Level level, String pattern, Object... args) {
         logPrivate(level, () -> MessageFormat.format(pattern, args));