Mostly use new core about model.

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/about/AboutDialog.java

@@ -22,64 +22,58 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.about;
 
+import com.dmdirc.DMDircMBassador;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
+import com.dmdirc.events.ClientInfoRequestEvent;
+import com.dmdirc.interfaces.ui.AboutDialogModel;
+import com.dmdirc.ui.core.about.InfoItem;
+import com.dmdirc.ui.core.util.URLHandler;
 
 import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 import javax.inject.Inject;
 import javax.swing.JButton;
 import javax.swing.JTabbedPane;
 import javax.swing.WindowConstants;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 
+import net.miginfocom.layout.LayoutUtil;
 import net.miginfocom.swing.MigLayout;
 
+import net.engio.mbassy.listener.Handler;
+
 /**
  * About dialog.
  */
-public class AboutDialog extends StandardDialog implements ActionListener, ChangeListener {
+public class AboutDialog extends StandardDialog {
 
-    /** Serial version UID. */
     private static final long serialVersionUID = 5;
-    /** Tabbed pane to use. */
-    private JTabbedPane tabbedPane;
-    /** Credits panel. */
-    private CreditsPanel cp;
-    /** Tab history. */
-    private int history;
-
-    /**
-     * Creates a new instance of AboutDialog.
-     *
-     * @param parentWindow  Parent window
-     * @param infoPanel     The info panel to display.
-     * @param creditsPanel  The credits panel to display.
-     * @param licensesPanel The licenses panel to display.
-     * @param aboutPanel    The about panel to display.
-     */
+    private final URLHandler urlHandler;
+    private final AboutDialogModel model;
+    private final SwingController controller;
+
     @Inject
     public AboutDialog(
             @MainWindow final Window parentWindow,
-            final InfoPanel infoPanel,
-            final CreditsPanel creditsPanel,
-            final LicencesPanel licensesPanel,
-            final AboutPanel aboutPanel) {
+            final AboutDialogModel model,
+            final URLHandler urlHandler,
+            final DMDircMBassador eventBus,
+            final SwingController controller,
+            final LicencesPanel licensesPanel) {
         super(parentWindow, ModalityType.MODELESS);
+        this.urlHandler = urlHandler;
+        this.model = model;
+        this.controller = controller;
 
-        initComponents(infoPanel, creditsPanel, licensesPanel, aboutPanel);
+        eventBus.subscribe(this);
+        model.load();
+        initComponents(licensesPanel);
     }
 
     /** Initialises the main UI components. */
-    private void initComponents(
-            final InfoPanel infoPanel,
-            final CreditsPanel creditsPanel,
-            final LicencesPanel licensesPanel,
-            final AboutPanel aboutPanel) {
-        tabbedPane = new JTabbedPane();
+    private void initComponents(final LicencesPanel licensesPanel) {
+        final JTabbedPane tabbedPane = new JTabbedPane();
 
         setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
         setTitle("About");
@@ -87,16 +81,13 @@ public class AboutDialog extends StandardDialog implements ActionListener, Chang
 
         orderButtons(new JButton(), new JButton());
 
-        getOkButton().addActionListener(this);
-        getCancelButton().addActionListener(this);
-
-        cp = creditsPanel;
+        getOkButton().addActionListener(e -> dispose());
+        getCancelButton().addActionListener(e -> dispose());
 
-        tabbedPane.add("About", aboutPanel);
-        tabbedPane.add("Credits", cp);
+        tabbedPane.add("About", new AboutPanel(urlHandler, model));
+        tabbedPane.add("Credits", new CreditsPanel(urlHandler, model));
         tabbedPane.add("Licences", licensesPanel);
-        tabbedPane.add("Information", infoPanel);
-        tabbedPane.addChangeListener(this);
+        tabbedPane.add("Information", new InfoPanel(model));
 
         getContentPane().setLayout(new MigLayout("ins rel, wrap 1, fill, "
                 + "wmin 600, wmax 600, hmin 400, hmax 400"));
@@ -104,30 +95,11 @@ public class AboutDialog extends StandardDialog implements ActionListener, Chang
         getContentPane().add(getOkButton(), "right");
     }
 
-    /**
-     * {@inheritDoc}.
-     *
-     * @param e Action event
-     */
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        dispose();
-    }
-
-    @Override
-    public boolean enterPressed() {
-        executeAction(getOkButton());
-        return true;
+    @Handler
+    public void handleInfoRequest(final ClientInfoRequestEvent event) {
+        event.addInfoItem(InfoItem.create("Swing UI Version", controller.getVersion().toString()),
+                InfoItem.create("Look and Feel", SwingController.getLookAndFeel()),
+                InfoItem.create("MiG Layout Version", LayoutUtil.getVersion())
+        );
     }
-
-    @Override
-    public void stateChanged(final ChangeEvent e) {
-        history = 10 * (history % 10000) + tabbedPane.getSelectedIndex();
-
-        if (history / 10 % 100 == 32 && (history & 1) == 1
-                && history >> 8 == 118) {
-            cp.showEE();
-        }
-    }
-
 }

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/about/AboutPanel.java

@@ -24,58 +24,38 @@ package com.dmdirc.addons.ui_swing.dialogs.about;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
+import com.dmdirc.interfaces.ui.AboutDialogModel;
 import com.dmdirc.ui.core.util.URLHandler;
 
-import javax.inject.Inject;
 import javax.swing.JPanel;
 import javax.swing.event.HyperlinkEvent;
-import javax.swing.event.HyperlinkEvent.EventType;
-import javax.swing.event.HyperlinkListener;
 
 import net.miginfocom.swing.MigLayout;
 
 /**
  * About DMDirc panel.
  */
-public final class AboutPanel extends JPanel implements HyperlinkListener {
+public final class AboutPanel extends JPanel {
 
-    /** A version number for this class. */
     private static final long serialVersionUID = 1;
-    /** The URL Handler to use to handle clicked links. */
     private final URLHandler urlHandler;
+    private final AboutDialogModel model;
 
-    /**
-     * Creates a new instance of AboutPanel.
-     *
-     * @param urlHandler The URL Handler to use to handle clicked links
-     */
-    @Inject
-    public AboutPanel(final URLHandler urlHandler) {
+    public AboutPanel(final URLHandler urlHandler, final AboutDialogModel model) {
         this.urlHandler = urlHandler;
+        this.model = model;
         setOpaque(UIUtilities.getTabbedPaneOpaque());
         initComponents();
     }
 
-    /** Initialises the components. */
     private void initComponents() {
-        final TextLabel about = new TextLabel("<html><center>"
-                + "<h1 style=\"margin-bottom: 0px;\">DMDirc</h1>"
-                + "<span style=\"font-style: italic;\">The intelligent IRC client.</span>"
-                + "<p>Easy to use, cross-platform IRC client.</p>"
-                + "<p><a href=\"http://www.dmdirc.com\">www.dmdirc.com</a></p>"
-                + "</center></html>", false);
-        about.addHyperlinkListener(this);
-
+        final TextLabel about = new TextLabel(model.getAbout(), false);
+        about.addHyperlinkListener(e -> {
+            if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
+                urlHandler.launchApp(e.getURL());
+            }
+        });
         setLayout(new MigLayout("ins rel, fill"));
-
         add(about, "align center");
     }
-
-    @Override
-    public void hyperlinkUpdate(final HyperlinkEvent e) {
-        if (e.getEventType() == EventType.ACTIVATED) {
-            urlHandler.launchApp(e.getURL());
-        }
-    }
-
 }

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/about/CreditsPanel.java

@@ -24,63 +24,57 @@ package com.dmdirc.addons.ui_swing.dialogs.about;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
+import com.dmdirc.interfaces.ui.AboutDialogModel;
+import com.dmdirc.ui.core.about.Developer;
 import com.dmdirc.ui.core.util.URLHandler;
 
-import javax.inject.Inject;
+import java.util.function.Consumer;
+
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
-import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkEvent.EventType;
-import javax.swing.event.HyperlinkListener;
 
 import net.miginfocom.swing.MigLayout;
 
 /**
  * Authors Panel.
  */
-public final class CreditsPanel extends JPanel implements HyperlinkListener {
+public final class CreditsPanel extends JPanel {
 
-    /** A version number for this class. */
     private static final long serialVersionUID = 2;
-    /** HTML label we're using. */
-    private TextLabel about;
-    /** URL Handler to use to open clicked links. */
     private final URLHandler urlHandler;
+    private final AboutDialogModel model;
 
-    /**
-     * Creates a new instance of CreditsPanel.
-     *
-     * @param urlHandler The URL handler to use to open clicked links
-     */
-    @Inject
-    public CreditsPanel(final URLHandler urlHandler) {
+    public CreditsPanel(final URLHandler urlHandler, final AboutDialogModel model) {
         this.urlHandler = urlHandler;
+        this.model = model;
 
         setOpaque(UIUtilities.getTabbedPaneOpaque());
         initComponents();
     }
 
-    /** Shows some alternate content. */
-    public void showEE() {
-        about.setText("<html><center><br><br><br>"
-                + "<img src=\"https://www.dmdirc.com/res/about.png\"></html>");
-    }
-
     /** Initialises the components. */
     private void initComponents() {
-        about = new TextLabel("<html>"
-                + "<h3 style='margin: 3px; padding: 0px 0px 5px 0px;'>Main developers:</h3>"
-                + "<ul style='list-style-type: circle; margin-top: 0px;'>"
-                + "<li><a href=\"https://www.md87.co.uk\">Chris 'MD87' Smith</a></li>"
-                + "<li><a href=\"https://www.greboid.com\">Gregory 'Greboid' Holmes</a></li>"
-                + "<li><a href=\"http://home.dataforce.org.uk\">Shane 'Dataforce' Mc Cormack</a></li>"
-                + "</ul>"
-                + "<h3 style='margin: 3px; padding: 0px 0px 5px 0px;'>Additional developers:</h3>"
-                + "<ul style='list-style-type: circle; margin-top: 0px;'>"
-                + "<li><a href=\"http://simonmott.co.uk/\">Simon 'Demented-Idiot' Mott</a></li>"
-                + "</ul>"
-                + "</html>");
-        about.addHyperlinkListener(this);
+        final StringBuilder sb = new StringBuilder();
+        sb.append("<html>");
+        sb.append("<h3 style='margin: 3px; padding: 0px 0px 5px 0px;'>Main Developers:</h3>");
+        sb.append("<ul style='margin-top: 0px;'>");
+        final Consumer<Developer> developerConsumer = i -> {
+                sb.append("<li><a href=\"").append(i.getWebsite()).append("\">");
+                sb.append(i.getName()).append("</a>").append("</li>");
+        };
+        model.getMainDevelopers().forEach(developerConsumer);
+        sb.append("</ul>");
+        sb.append("<h3 style='margin: 3px; padding: 0px 0px 5px 0px;'>Other Developers: </h3>");
+        sb.append("<ul style='margin-top: 0px;'>");
+        model.getOtherDevelopers().forEach(developerConsumer);
+        sb.append("</ul></html>");
+        final TextLabel about = new TextLabel(sb.toString());
+        about.addHyperlinkListener(e -> {
+            if (e.getEventType() == EventType.ACTIVATED) {
+                urlHandler.launchApp(e.getURL());
+            }
+        });
 
         setLayout(new MigLayout("ins rel, fill"));
         final JScrollPane scrollPane = new JScrollPane(about);
@@ -89,11 +83,4 @@ public final class CreditsPanel extends JPanel implements HyperlinkListener {
         add(scrollPane, "grow, push");
     }
 
-    @Override
-    public void hyperlinkUpdate(final HyperlinkEvent e) {
-        if (e.getEventType() == EventType.ACTIVATED) {
-            urlHandler.launchApp(e.getURL());
-        }
-    }
-
 }

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/about/InfoPanel.java

@@ -22,19 +22,11 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.about;
 
-import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
-import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.util.ClientInfo;
-import com.dmdirc.util.DateUtils;
+import com.dmdirc.interfaces.ui.AboutDialogModel;
 
 import java.awt.Font;
-import java.nio.charset.Charset;
 
-import javax.inject.Inject;
 import javax.swing.JEditorPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -42,38 +34,20 @@ import javax.swing.UIManager;
 import javax.swing.text.html.HTMLDocument;
 import javax.swing.text.html.HTMLEditorKit;
 
-import net.miginfocom.layout.LayoutUtil;
 import net.miginfocom.swing.MigLayout;
 
 /** Info panel. */
 public final class InfoPanel extends JPanel {
 
-    /** Serial version UID. */
     private static final long serialVersionUID = 1;
-    /** Parent controller. */
-    private final SwingController controller;
-    /** The config to read settings from. */
-    private final AggregateConfigProvider globalConfig;
-    /** The base directory used for settings. */
-    private final String baseDirectory;
-    /** Used to get information about the client. */
-    private final ClientInfo clientInfo;
+    private final AboutDialogModel model;
 
-    @Inject
-    public InfoPanel(
-            final SwingController controller,
-            @GlobalConfig final AggregateConfigProvider globalConfig,
-            @Directory(DirectoryType.BASE) final String baseDirectory,
-            final ClientInfo clientInfo) {
-        this.controller = controller;
-        this.globalConfig = globalConfig;
-        this.baseDirectory = baseDirectory;
-        this.clientInfo = clientInfo;
+    public InfoPanel(final AboutDialogModel model) {
+        this.model = model;
         setOpaque(UIUtilities.getTabbedPaneOpaque());
         initComponents();
     }
 
-    /** Initialises the components. */
     private void initComponents() {
         final JScrollPane scrollPane = new JScrollPane();
         final JEditorPane infoPane = new JEditorPane();
@@ -83,23 +57,14 @@ public final class InfoPanel extends JPanel {
                 + "{ font-family: " + font.getFamily() + "; " + "font-size: "
                 + font.getSize() + "pt; }");
 
-        infoPane.setText("<html>"
-                + "<b>DMDirc version: </b>" + clientInfo.getVersionInformation() + "<br>"
-                + "<b>Mode Aliases version: </b>"
-                + globalConfig.getOption("identity", "modealiasversion")
-                + "<br>"
-                + "<b>Swing UI version: </b>" + controller.getVersion() + "<br>"
-                + "<b>OS Version: </b>" + clientInfo.getOperatingSystemInformation() + "<br>"
-                + "<b>Profile directory: </b>" + baseDirectory + "<br>"
-                + "<b>Java version: </b>" + clientInfo.getJavaInformation() + "<br>"
-                + "<b>Look and Feel: </b>" + SwingController.getLookAndFeel()
-                + "<br>"
-                + "<b>MiG Layout version: </b>" + LayoutUtil.getVersion()
-                + "<br>"
-                + "<b>Java Default charset: </b>" + Charset.defaultCharset().displayName() + "<br>"
-                + "<b>Client Uptime: </b>"
-                + DateUtils.formatDuration((int) clientInfo.getUptime() / 1000) + "<br>"
-                + "</html>");
+        final StringBuilder sb = new StringBuilder();
+        sb.append("<html>");
+        model.getInfo().forEach(i -> {
+            sb.append("<b>").append(i.getDescription()).append(": ").append("</b>");
+            sb.append(i.getInformation()).append("<br>");
+        });
+        sb.append("</html>");
+        infoPane.setText(sb.toString());
         infoPane.setEditable(false);
         scrollPane.setViewportView(infoPane);
 

ui_swing/src/com/dmdirc/addons/ui_swing/injection/DialogModule.java

@@ -48,11 +48,13 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityFactory;
+import com.dmdirc.interfaces.ui.AboutDialogModel;
 import com.dmdirc.interfaces.ui.AliasDialogModel;
 import com.dmdirc.interfaces.ui.FeedbackDialogModel;
 import com.dmdirc.interfaces.ui.NewServerDialogModel;
 import com.dmdirc.interfaces.ui.ProfilesDialogModel;
 import com.dmdirc.plugins.ServiceManager;
+import com.dmdirc.ui.core.about.CoreAboutDialogModel;
 import com.dmdirc.ui.core.aliases.CoreAliasDialogModel;
 import com.dmdirc.ui.core.feedback.CoreFeedbackDialogModel;
 import com.dmdirc.ui.core.newserver.CoreNewServerDialogModel;
@@ -110,6 +112,11 @@ public class DialogModule {
         return model;
     }
 
+    @Provides
+    public AboutDialogModel getAboutDialogModel(final CoreAboutDialogModel model) {
+        return model;
+    }
+
     @Provides
     @Singleton
     public DialogProvider<NewServerDialog> getNewServerDialogProvider(