Made announcement bubbles and dialogs that contain links clickable

diylc/diylc-swing/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.diylc</groupId>
         <artifactId>diylc-parent</artifactId>
-        <version>6.3.0</version>
+        <version>6.4.0</version>
     </parent>
     
     <artifactId>diylc-swing</artifactId>

diylc/diylc-swing/src/main/java/org/diylc/swing/gui/ClickableHtmlUtils.java

@@ -0,0 +1,148 @@
+/*
+
+    DIY Layout Creator (DIYLC).
+    Copyright (c) 2009-2025 held jointly by the individual authors.
+
+    This file is part of DIYLC.
+
+    DIYLC is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    DIYLC is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DIYLC.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+package org.diylc.swing.gui;
+
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.Font;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import javax.swing.BorderFactory;
+import javax.swing.JComponent;
+import javax.swing.JEditorPane;
+import javax.swing.UIManager;
+import javax.swing.event.HyperlinkEvent;
+import javax.swing.event.HyperlinkListener;
+import org.apache.log4j.Logger;
+import org.diylc.announcements.AnnouncementUtils;
+import org.diylc.appframework.miscutils.Utils;
+
+/**
+ * Utility for creating interactive Swing HTML components with clickable links.
+ */
+public class ClickableHtmlUtils {
+
+  private static final Logger LOG = Logger.getLogger(ClickableHtmlUtils.class);
+
+  /**
+   * Creates a JEditorPane configured to display HTML with clickable links and whole-text click navigation.
+   *
+   * @param html the HTML content to display
+   * @param defaultUrlToOpen optional default URL to open when clicking non-hyperlink area of text (if null, extracted from html)
+   * @param onLinkOpened optional callback executed when a link is opened
+   * @return configured JEditorPane
+   */
+  public static JEditorPane createClickableHtmlPane(String html, final String defaultUrlToOpen,
+      final Runnable onLinkOpened) {
+    JEditorPane editorPane = new JEditorPane();
+    editorPane.setContentType("text/html");
+    editorPane.setText(html != null ? html : "");
+    editorPane.setEditable(false);
+    editorPane.setOpaque(false);
+    editorPane.setBackground(new Color(0, 0, 0, 0));
+    editorPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+    editorPane.putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES, Boolean.TRUE);
+
+    final String targetUrl =
+        defaultUrlToOpen != null ? defaultUrlToOpen : AnnouncementUtils.extractFirstUrl(html);
+    final long[] lastClickTime = new long[1];
+
+    editorPane.addHyperlinkListener(new HyperlinkListener() {
+
+      @Override
+      public void hyperlinkUpdate(HyperlinkEvent e) {
+        if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType())) {
+          lastClickTime[0] = System.currentTimeMillis();
+          String url = e.getURL() != null ? e.getURL().toString() : e.getDescription();
+          if (url != null) {
+            openUrl(url);
+            if (onLinkOpened != null) {
+              onLinkOpened.run();
+            }
+          }
+        }
+      }
+    });
+
+    if (targetUrl != null) {
+      editorPane.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+      editorPane.addMouseListener(new MouseAdapter() {
+
+        @Override
+        public void mouseClicked(MouseEvent e) {
+          if (System.currentTimeMillis() - lastClickTime[0] > 500) {
+            lastClickTime[0] = System.currentTimeMillis();
+            openUrl(targetUrl);
+            if (onLinkOpened != null) {
+              onLinkOpened.run();
+            }
+          }
+        }
+      });
+    }
+
+    return editorPane;
+  }
+
+  /**
+   * Creates a JComponent suitable for display inside JOptionPane message dialogs with clickable links.
+   *
+   * @param message HTML or text message
+   * @return JComponent with clickable links
+   */
+  public static JComponent createClickableMessageComponent(String message) {
+    if (message == null || message.isEmpty()) {
+      return new JEditorPane();
+    }
+    String html = message;
+    if (!html.trim().toLowerCase().startsWith("<html>")) {
+      html = "<html>" + html + "</html>";
+    }
+    JEditorPane pane = createClickableHtmlPane(html, null, null);
+    Font font = UIManager.getFont("Label.font");
+    if (font != null) {
+      pane.setFont(font);
+    }
+    Color fg = UIManager.getColor("Label.foreground");
+    if (fg != null) {
+      pane.setForeground(fg);
+    }
+    return pane;
+  }
+
+  /**
+   * Opens a URL in the system browser.
+   *
+   * @param url URL to open
+   */
+  public static void openUrl(String url) {
+    if (url == null || url.trim().isEmpty()) {
+      return;
+    }
+    String normalized = AnnouncementUtils.normalizeUrl(url);
+    try {
+      Utils.openURL(normalized);
+    } catch (Exception ex) {
+      LOG.error("Could not open URL: " + normalized, ex);
+    }
+  }
+}

diylc/diylc-swing/src/main/java/org/diylc/swing/gui/MainFrame.java

@@ -56,6 +56,7 @@ import javax.swing.Timer;
 import javax.swing.event.MenuEvent;
 import javax.swing.event.MenuListener;
 import org.apache.log4j.Logger;
+import org.diylc.announcements.AnnouncementUtils;
 import org.diylc.appframework.miscutils.ConfigurationManager;
 import org.diylc.appframework.miscutils.IConfigurationManager;
 import org.diylc.swing.IDynamicSubmenuHandler;
@@ -288,7 +289,12 @@ public class MainFrame extends JFrame implements ISwingUI {
 
   @Override
   public void showMessage(String message, String title, int messageType) {
-    JOptionPane.showMessageDialog(this, message, title, messageType);
+    if (message != null && (message.toLowerCase().contains("<html>") || AnnouncementUtils.containsLink(message))) {
+      JComponent component = ClickableHtmlUtils.createClickableMessageComponent(message);
+      JOptionPane.showMessageDialog(this, component, title, messageType);
+    } else {
+      JOptionPane.showMessageDialog(this, message, title, messageType);
+    }
   }
 
   @Override

diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/statusbar/StatusBar.java

@@ -59,14 +59,19 @@ import org.diylc.swingframework.MemoryBar;
 import org.diylc.swingframework.miscutils.PercentageListCellRenderer;
 import org.diylc.swingframework.update.UpdateDialog;
 import org.diylc.swingframework.update.UpdateLabel;
+import java.awt.Color;
+import java.awt.Font;
+import javax.swing.JEditorPane;
 import net.java.balloontip.BalloonTip;
 import net.java.balloontip.styles.EdgedBalloonStyle;
 import org.diylc.announcements.AnnouncementProvider;
+import org.diylc.announcements.AnnouncementUtils;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.IView;
 import org.diylc.lang.LangUtil;
 import org.diylc.presenter.Presenter;
 import org.diylc.swing.ISwingUI;
+import org.diylc.swing.gui.ClickableHtmlUtils;
 import org.diylc.utils.IconLoader;
 
 public class StatusBar extends JPanel implements IPlugIn {
@@ -172,8 +177,7 @@ public class StatusBar extends JPanel implements IPlugIn {
       @Override
       public void complete(String result) {
         if (result != null && result.length() > 0) {
-          new BalloonTip(getUpdateLabel(), result, new EdgedBalloonStyle(UIManager.getColor("ToolTip.background"),
-              UIManager.getColor("ToolTip.foreground")), true);
+          showAnnouncementBalloon(result);
           announcementProvider.dismissed();
         }
       }
@@ -568,4 +572,51 @@ public class StatusBar extends JPanel implements IPlugIn {
       }
     });
   }
+
+  private void showAnnouncementBalloon(String result) {
+    String html = result;
+    final String firstUrl = AnnouncementUtils.extractFirstUrl(html);
+    final BalloonTip[] balloonTipHolder = new BalloonTip[1];
+
+    JEditorPane pane = ClickableHtmlUtils.createClickableHtmlPane(html, firstUrl, new Runnable() {
+
+      @Override
+      public void run() {
+        if (balloonTipHolder[0] != null) {
+          balloonTipHolder[0].closeBalloon();
+        }
+      }
+    });
+
+    Font font = UIManager.getFont("ToolTip.font");
+    if (font == null) {
+      font = UIManager.getFont("Label.font");
+    }
+    if (font != null) {
+      pane.setFont(font);
+    }
+    Color fg = UIManager.getColor("ToolTip.foreground");
+    if (fg != null) {
+      pane.setForeground(fg);
+    }
+
+    EdgedBalloonStyle style = new EdgedBalloonStyle(
+        UIManager.getColor("ToolTip.background"),
+        UIManager.getColor("ToolTip.foreground"));
+
+    final BalloonTip balloonTip = new BalloonTip(getUpdateLabel(), pane, style, true);
+    balloonTipHolder[0] = balloonTip;
+
+    if (firstUrl != null) {
+      balloonTip.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+      balloonTip.addMouseListener(new MouseAdapter() {
+
+        @Override
+        public void mouseClicked(MouseEvent e) {
+          ClickableHtmlUtils.openUrl(firstUrl);
+          balloonTip.closeBalloon();
+        }
+      });
+    }
+  }
 }