Manually create the server factory.

Change-Id: I95836b7bb40bcfef25b2504fe50c5f63a723975b
Reviewed-on: http://gerrit.dmdirc.com/3699
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/Server.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc;
 
-import com.dmdirc.ClientModule.UserConfig;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.events.ChannelOpenedEvent;
@@ -67,8 +66,6 @@ import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.Formatter;
 import com.dmdirc.util.URLBuilder;
-import com.dmdirc.util.annotations.factory.Factory;
-import com.dmdirc.util.annotations.factory.Unbound;
 
 import com.google.common.eventbus.EventBus;
 
@@ -105,7 +102,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
  * The Server class represents the client's view of a server. It maintains a list of all channels,
  * queries, etc, and handles parser callbacks pertaining to the server.
  */
-@Factory(inject = true, singleton = true, providers = true, name = "ServerFactoryImpl")
 public class Server extends FrameContainer implements ConfigChangeListener,
         CertificateProblemListener, Connection {
 
@@ -215,8 +211,8 @@ public class Server extends FrameContainer implements ConfigChangeListener,
      */
     public Server(
             final ServerManager manager,
-            @Unbound final ConfigProviderMigrator configMigrator,
-            @Unbound final CommandParser commandParser,
+            final ConfigProviderMigrator configMigrator,
+            final CommandParser commandParser,
             final ParserFactory parserFactory,
             final TabCompleterFactory tabCompleterFactory,
             final IdentityFactory identityFactory,
@@ -229,10 +225,10 @@ public class Server extends FrameContainer implements ConfigChangeListener,
             final URLBuilder urlBuilder,
             final EventBus eventBus,
             final MessageEncoderFactory messageEncoderFactory,
-            @SuppressWarnings("qualifiers") @UserConfig final ConfigProvider userSettings,
-            @Unbound final ScheduledExecutorService executorService,
-            @Unbound final URI uri,
-            @Unbound final ConfigProvider profile) {
+            final ConfigProvider userSettings,
+            final ScheduledExecutorService executorService,
+            final URI uri,
+            final ConfigProvider profile) {
         super(null, "server-disconnected",
                 getHost(uri),
                 getHost(uri),

src/com/dmdirc/ServerFactoryImpl.java

@@ -0,0 +1,109 @@
+/*
+ * 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;
+
+import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.interfaces.config.ConfigProviderMigrator;
+import com.dmdirc.interfaces.config.IdentityFactory;
+import com.dmdirc.messages.MessageSinkManager;
+import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.core.components.StatusBarManager;
+import com.dmdirc.ui.input.TabCompleterFactory;
+import com.dmdirc.util.URLBuilder;
+
+import com.google.common.eventbus.EventBus;
+
+import java.net.URI;
+import java.util.concurrent.ScheduledExecutorService;
+
+import javax.inject.Inject;
+import javax.inject.Provider;
+import javax.inject.Singleton;
+
+/**
+ * Factory for {@link Server}s
+ */
+@Singleton
+public class ServerFactoryImpl {
+
+    private final Provider<ServerManager> manager;
+    private final ParserFactory parserFactory;
+    private final TabCompleterFactory tabCompleterFactory;
+    private final IdentityFactory identityFactory;
+    private final MessageSinkManager messageSinkManager;
+    private final StatusBarManager statusBarManager;
+    private final WindowManager windowManager;
+    private final Provider<ChannelFactory> channelFactory;
+    private final Provider<QueryFactory> queryFactory;
+    private final Provider<RawFactory> rawFactory;
+    private final URLBuilder urlBuilder;
+    private final EventBus eventBus;
+    private final MessageEncoderFactory messageEncoderFactory;
+    private final ConfigProvider userSettings;
+
+    @Inject
+    public ServerFactoryImpl(
+            final Provider<ServerManager> manager,
+            final ParserFactory parserFactory,
+            final TabCompleterFactory tabCompleterFactory,
+            final IdentityFactory identityFactory,
+            final MessageSinkManager messageSinkManager,
+            final StatusBarManager statusBarManager,
+            final WindowManager windowManager,
+            final Provider<ChannelFactory> channelFactory,
+            final Provider<QueryFactory> queryFactory,
+            final Provider<RawFactory> rawFactory,
+            final URLBuilder urlBuilder,
+            final EventBus eventBus,
+            final MessageEncoderFactory messageEncoderFactory,
+            @ClientModule.UserConfig final ConfigProvider userSettings) {
+        this.manager = manager;
+        this.parserFactory = parserFactory;
+        this.tabCompleterFactory = tabCompleterFactory;
+        this.identityFactory = identityFactory;
+        this.messageSinkManager = messageSinkManager;
+        this.statusBarManager = statusBarManager;
+        this.windowManager = windowManager;
+        this.channelFactory = channelFactory;
+        this.queryFactory = queryFactory;
+        this.rawFactory = rawFactory;
+        this.urlBuilder = urlBuilder;
+        this.eventBus = eventBus;
+        this.messageEncoderFactory = messageEncoderFactory;
+        this.userSettings = userSettings;
+    }
+
+    public Server getServer(
+            final ConfigProviderMigrator configMigrator,
+            final CommandParser commandParser,
+            final ScheduledExecutorService executorService,
+            final URI uri,
+            final ConfigProvider profile) {
+        return new Server(manager.get(), configMigrator, commandParser, parserFactory,
+                tabCompleterFactory, identityFactory, messageSinkManager, statusBarManager,
+                windowManager, channelFactory.get(), queryFactory.get(), rawFactory.get(),
+                urlBuilder, eventBus, messageEncoderFactory, userSettings, executorService, uri,
+                profile);
+    }
+}