Remove the licenseloader.

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.dialogs.about;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -47,7 +46,6 @@ public class AboutDialog extends StandardDialog {
     private static final long serialVersionUID = 5;
     private final URLHandler urlHandler;
     private final AboutDialogModel model;
-    private final DMDircMBassador eventBus;
     private final AggregateConfigProvider config;
 
     @Inject
@@ -55,12 +53,10 @@ public class AboutDialog extends StandardDialog {
             @GlobalConfig final AggregateConfigProvider config,
             @MainWindow final Window parentWindow,
             final AboutDialogModel model,
-            final URLHandler urlHandler,
-            final DMDircMBassador eventBus) {
+            final URLHandler urlHandler) {
         super(parentWindow, ModalityType.MODELESS);
         this.urlHandler = urlHandler;
         this.model = model;
-        this.eventBus = eventBus;
         this.config = config;
         model.load();
         initComponents();
@@ -81,7 +77,7 @@ public class AboutDialog extends StandardDialog {
 
         tabbedPane.add("About", new AboutPanel(urlHandler, model));
         tabbedPane.add("Credits", new CreditsPanel(urlHandler, model));
-        tabbedPane.add("Licences", new LicencesPanel(model, config, eventBus));
+        tabbedPane.add("Licences", new LicencesPanel(model, config));
         tabbedPane.add("Information", new InfoPanel(model));
 
         getContentPane().setLayout(new MigLayout("ins rel, wrap 1, fill, "

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

@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.ui_swing.dialogs.about;
-
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
-import com.dmdirc.interfaces.ui.AboutDialogModel;
-import com.dmdirc.ui.core.about.LicensedComponent;
-
-import java.io.IOException;
-
-import javax.swing.JTree;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.MutableTreeNode;
-import javax.swing.tree.TreeNode;
-
-/**
- * Background loader of licences into a list.
- */
-public class LicenceLoader extends LoggingSwingWorker<Void, Void> {
-
-    /** Tree to add licenses to. */
-    private final JTree tree;
-    private final AboutDialogModel model;
-    /** Model to load licences into. */
-    private final DefaultTreeModel treeModel;
-
-    /**
-     * Instantiates a new licence loader.
-     *
-     * @param tree     Tree to add licenses to
-     * @param model    Model to load licences into
-     * @param eventBus The event bus to post errors to
-     */
-    public LicenceLoader(final AboutDialogModel model, final JTree tree,
-            final DefaultTreeModel treeModel, final DMDircMBassador eventBus) {
-        super(eventBus);
-        this.tree = tree;
-        this.model = model;
-        this.treeModel = treeModel;
-    }
-
-    @Override
-    protected Void doInBackground() throws IOException {
-        model.getLicensedComponents().forEach(this::addLicensedComponent);
-        return null;
-    }
-
-    private void addLicensedComponent(final LicensedComponent component) {
-        final MutableTreeNode componentNode = new DefaultMutableTreeNode(component);
-        treeModel.insertNodeInto(componentNode, (MutableTreeNode) treeModel.getRoot(),
-                treeModel.getChildCount(treeModel.getRoot()));
-        component.getLicences().forEach(l -> treeModel.insertNodeInto(
-                new DefaultMutableTreeNode(l), componentNode,
-                treeModel.getChildCount(componentNode)));
-    }
-
-    @Override
-    protected void done() {
-        treeModel.nodeStructureChanged((TreeNode) treeModel.getRoot());
-        for (int i = 0; i < tree.getRowCount(); i++) {
-            tree.expandRow(i);
-        }
-        tree.setSelectionRow(0);
-        super.done();
-    }
-}

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.about;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.TreeScroller;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -45,6 +44,8 @@ import javax.swing.text.html.HTMLDocument;
 import javax.swing.text.html.HTMLEditorKit;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.MutableTreeNode;
+import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreeSelectionModel;
 
 import net.miginfocom.layout.PlatformDefaults;
@@ -57,6 +58,7 @@ public class LicencesPanel extends JPanel implements TreeSelectionListener {
 
     /** Serial version UID. */
     private static final long serialVersionUID = 3;
+    private final AboutDialogModel model;
     /** Config manager. */
     private final AggregateConfigProvider config;
     /** Licence scroll pane. */
@@ -69,12 +71,12 @@ public class LicencesPanel extends JPanel implements TreeSelectionListener {
     private JTree list;
 
     public LicencesPanel(final AboutDialogModel model,
-            final AggregateConfigProvider globalConfig,
-            final DMDircMBassador eventBus) {
+            final AggregateConfigProvider globalConfig) {
+        this.model = model;
         config = globalConfig;
         initComponents();
-        new LicenceLoader(model, list, listModel, eventBus).execute();
         addListeners();
+        initLicenses();
         layoutComponents();
     }
 
@@ -156,4 +158,24 @@ public class LicencesPanel extends JPanel implements TreeSelectionListener {
         UIUtilities.resetScrollPane(scrollPane);
     }
 
+    private void initLicenses() {
+        model.getLicensedComponents().forEach(this::addLicensedComponent);
+        listModel.nodeStructureChanged((TreeNode) listModel.getRoot());
+        for (int i = 0; i < list.getRowCount(); i++) {
+            list.expandRow(i);
+        }
+        list.setSelectionRow(0);
+    }
+
+
+
+    private void addLicensedComponent(final LicensedComponent component) {
+        final MutableTreeNode componentNode = new DefaultMutableTreeNode(component);
+        listModel.insertNodeInto(componentNode, (MutableTreeNode) listModel.getRoot(),
+                listModel.getChildCount(listModel.getRoot()));
+        component.getLicences().forEach(l -> listModel.insertNodeInto(
+                new DefaultMutableTreeNode(l), componentNode,
+                listModel.getChildCount(componentNode)));
+    }
+
 }