Merge pull request #129 from greboid/activewindowtests

Update addon browser for addons.dmdirc.com move.

ui_swing/src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonInfo.java

@@ -40,20 +40,11 @@ public class AddonInfo {
 
     /** Addon site ID. */
     private final int id;
-    /**
-     * Stable download name. This should be prepended with http://addons.dmdirc.com/addondownload/
-     * to get a full URL.
-     */
+    /** Stable download name. */
     private final String stableDownload;
-    /**
-     * Stable download name. This should be prepended with http://addons.dmdirc.com/addondownload/
-     * to get a full URL.
-     */
+    /** Unstable download name. */
     private final String unstableDownload;
-    /**
-     * Stable download name. This should be prepended with http://addons.dmdirc.com/addondownload/
-     * to get a full URL.
-     */
+    /** Nightly download name. */
     private final String nightlyDownload;
     /** Addon title. */
     private final String title;
@@ -104,13 +95,12 @@ public class AddonInfo {
         verified = entry.get("verified").equals("yes");
         date = Integer.parseInt(entry.get("date"));
         if (entry.get("screenshot").equals("yes")) {
-            screenshot = new ImageIcon(urlBuilder.getUrl(
-                    "http://addons.dmdirc.com/addonimg/" + id));
+            screenshot = new ImageIcon(
+                    urlBuilder.getUrl("https://addons.dmdirc.com/addonimg/" + id));
             screenshot.setImage(screenshot.getImage().
                     getScaledInstance(150, 150, Image.SCALE_SMOOTH));
         } else {
-            screenshot = new ImageIcon(urlBuilder.getUrl(
-                    "dmdirc://com/dmdirc/res/logo.png"));
+            screenshot = new ImageIcon(urlBuilder.getUrl("dmdirc://com/dmdirc/res/logo.png"));
         }
 
         UpdateChannel tempChannel;

ui_swing/src/com/dmdirc/addons/ui_swing/components/addonbrowser/InstallWorker.java

@@ -77,8 +77,7 @@ public class InstallWorker extends LoggingSwingWorker<String, Void> {
     protected String doInBackground() {
         try {
             final Path file = Paths.get(tempDirectory, "." + info.getId());
-            downloader.downloadPage("http://addons.dmdirc.com/addondownload/"
-                    + info.getDownload(), file);
+            downloader.downloadPage(info.getDownload(), file);
 
             switch (info.getType()) {
                 case TYPE_ACTION_PACK:

ui_swing/src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonPanel.java

@@ -120,7 +120,7 @@ public abstract class AddonPanel extends JPanel implements AddonToggleListener,
                 + getTypeName().substring(1) + " allow you to extend the "
                 + "functionality of DMDirc.");
         getMoreLabel = new TextLabel(
-                "<a href=\"http://addons.dmdirc.com\">Get more addons</a>");
+                "<a href=\"https://addons.dmdirc.com\">Get more addons</a>");
         getMoreLabel.addHyperlinkListener(this);
         addonInfo = new AddonInfoPanel();
         addonInfo.addListener(this);