Remove annotations library.

Change-Id: I93945d27c14569581d0d0dcd7dcc32fe6eb32fee
Reviewed-on: http://gerrit.dmdirc.com/3731
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

ivy.xml

@@ -19,7 +19,6 @@
         <dependency org="org.slf4j" name="slf4j-api" rev="1.+" conf="main->default" />
 
         <!-- Main - ui_swing -->
-        <dependency org="com.dmdirc" name="annotations" rev="[0.6.1,)" conf="main->default" />
         <dependency org="com.miglayout" name="miglayout-swing" rev="4.+" conf="main->default" />
         <dependency org="org.swinglabs" name="jxlayer" rev="3.+" conf="main->default" />
         <dependency org="com.greboid.libraries" name="locksupport" rev="latest.release" conf="main->default" />

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

@@ -33,7 +33,6 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.updater.manager.UpdateManager;
 import com.dmdirc.util.URLBuilder;
-import com.dmdirc.util.annotations.factory.Unbound;
 import com.dmdirc.util.io.ConfigFile;
 import com.dmdirc.util.io.DownloadListener;
 import com.dmdirc.util.io.Downloader;
@@ -112,10 +111,10 @@ public class DataLoaderWorker
             final UpdateManager updateManager,
             @SuppressWarnings("qualifiers") @Directory(DirectoryType.TEMPORARY) final String tempDirectory,
             final EventBus eventBus,
-            @Unbound final AddonTable table,
-            @Unbound final boolean download,
-            @Unbound final BrowserWindow browserWindow,
-            @Unbound final JScrollPane scrollPane) {
+            final AddonTable table,
+            final boolean download,
+            final BrowserWindow browserWindow,
+            final JScrollPane scrollPane) {
         super(eventBus);
         this.downloader = downloader;
         this.globalConfig = globalConfig;

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

@@ -27,7 +27,6 @@ import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
 import com.dmdirc.plugins.PluginManager;
-import com.dmdirc.util.annotations.factory.Unbound;
 import com.dmdirc.util.io.Downloader;
 
 import com.google.common.eventbus.EventBus;
@@ -63,8 +62,8 @@ public class InstallWorker extends LoggingSwingWorker<String, Void> {
             @SuppressWarnings("qualifiers") @Directory(DirectoryType.THEMES) final String themeDirectory,
             final PluginManager pluginManager,
             final EventBus eventBus,
-            @Unbound final AddonInfo info,
-            @Unbound final InstallerWindow window) {
+            final AddonInfo info,
+            final InstallerWindow window) {
         super(eventBus);
         this.downloader = downloader;
         this.info = info;

src/com/dmdirc/addons/ui_swing/dialogs/url/URLDialog.java

@@ -31,8 +31,6 @@ import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.ui.core.util.URLHandler;
-import com.dmdirc.util.annotations.factory.Factory;
-import com.dmdirc.util.annotations.factory.Unbound;
 
 import java.awt.Window;
 import java.awt.event.ActionEvent;
@@ -44,7 +42,6 @@ import javax.swing.JButton;
 import net.miginfocom.swing.MigLayout;
 
 /** URL Protocol dialog. */
-@Factory(inject = true, singleton = true)
 public class URLDialog extends StandardDialog implements ActionListener {
 
     /** Serial version UID. */
@@ -70,7 +67,7 @@ public class URLDialog extends StandardDialog implements ActionListener {
      * @param urlHandler   The URL Handler to use to handle clicked links
      */
     public URLDialog(
-            @Unbound final URI url,
+            final URI url,
             @SuppressWarnings("qualifiers") @GlobalConfig final AggregateConfigProvider global,
             @SuppressWarnings("qualifiers") @UserConfig final ConfigProvider config,
             @SuppressWarnings("qualifiers") @MainWindow final Window parentWindow,

src/com/dmdirc/addons/ui_swing/dialogs/url/URLDialogFactory.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2006-2014 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.url;
+
+import com.dmdirc.ClientModule;
+import com.dmdirc.addons.ui_swing.injection.MainWindow;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.ui.core.util.URLHandler;
+
+import java.awt.Window;
+import java.net.URI;
+
+import javax.inject.Inject;
+
+/**
+ * Factory for {@link URLDialogFactory}s
+ */
+public class URLDialogFactory {
+
+    private final AggregateConfigProvider global;
+    private final ConfigProvider config;
+    private final Window parentWindow;
+    private final URLHandler urlHandler;
+
+    @Inject
+    public URLDialogFactory(
+            @SuppressWarnings("qualifiers") @ClientModule.GlobalConfig final AggregateConfigProvider global,
+            @SuppressWarnings("qualifiers") @ClientModule.UserConfig final ConfigProvider config,
+            @SuppressWarnings("qualifiers") @MainWindow final Window parentWindow,
+            final URLHandler urlHandler) {
+        this.global = global;
+        this.config = config;
+        this.parentWindow = parentWindow;
+        this.urlHandler = urlHandler;
+    }
+
+    public URLDialog getURLDialog(final URI uri) {
+        return new URLDialog(uri, global, config, parentWindow, urlHandler);
+    }
+}