Manually create some factories.

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

src/com/dmdirc/Channel.java

@@ -47,8 +47,6 @@ import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.URLBuilder;
-import com.dmdirc.util.annotations.factory.Factory;
-import com.dmdirc.util.annotations.factory.Unbound;
 import com.dmdirc.util.collections.ListenerList;
 import com.dmdirc.util.collections.RollingList;
 
@@ -69,7 +67,6 @@ import javax.annotation.Nonnull;
  * events from the parser, maintains the corresponding ChannelWindow, and handles user input for the
  * channel.
  */
-@Factory(inject = true, providers = true, singleton = true)
 public class Channel extends MessageTarget implements GroupChat {
 
     /** List of registered listeners. */
@@ -109,9 +106,9 @@ public class Channel extends MessageTarget implements GroupChat {
      * @param eventBus            The bus to despatch events onto.
      */
     public Channel(
-            @Unbound final Server newServer,
-            @Unbound final ChannelInfo newChannelInfo,
-            @Unbound final ConfigProviderMigrator configMigrator,
+            final Server newServer,
+            final ChannelInfo newChannelInfo,
+            final ConfigProviderMigrator configMigrator,
             final TabCompleterFactory tabCompleterFactory,
             final CommandController commandController,
             final MessageSinkManager messageSinkManager,

src/com/dmdirc/ChannelFactory.java

@@ -0,0 +1,66 @@
+/*
+ * 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.interfaces.CommandController;
+import com.dmdirc.interfaces.config.ConfigProviderMigrator;
+import com.dmdirc.messages.MessageSinkManager;
+import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.ui.input.TabCompleterFactory;
+import com.dmdirc.util.URLBuilder;
+
+import com.google.common.eventbus.EventBus;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+/**
+ * Factory for {@link Channel}s.
+ */
+@Singleton
+public class ChannelFactory {
+
+    private final TabCompleterFactory tabCompleterFactory;
+    private final CommandController commandController;
+    private final MessageSinkManager messageSinkManager;
+    private final URLBuilder urlBuilder;
+    private final EventBus eventBus;
+
+    @Inject
+    public ChannelFactory(final TabCompleterFactory tabCompleterFactory,
+            final CommandController commandController, final MessageSinkManager messageSinkManager,
+            final URLBuilder urlBuilder, final EventBus eventBus) {
+        this.tabCompleterFactory = tabCompleterFactory;
+        this.commandController = commandController;
+        this.messageSinkManager = messageSinkManager;
+        this.urlBuilder = urlBuilder;
+        this.eventBus = eventBus;
+    }
+
+    public Channel getChannel(final Server server,
+            final ChannelInfo channelInfo,
+            final ConfigProviderMigrator configMigrator) {
+        return new Channel(server, channelInfo, configMigrator, tabCompleterFactory,
+                commandController, messageSinkManager, urlBuilder, eventBus);
+    }
+}

src/com/dmdirc/Query.java

@@ -51,8 +51,6 @@ import com.dmdirc.parser.interfaces.callbacks.QuitListener;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.util.URLBuilder;
-import com.dmdirc.util.annotations.factory.Factory;
-import com.dmdirc.util.annotations.factory.Unbound;
 
 import java.awt.Toolkit;
 import java.util.Arrays;
@@ -64,7 +62,6 @@ import java.util.List;
  * for query events from the parser, maintains the corresponding QueryWindow, and handles user input
  * for the query.
  */
-@Factory(inject = true, providers = true, singleton = true)
 public class Query extends MessageTarget implements PrivateActionListener,
         PrivateMessageListener, NickChangeListener, QuitListener,
         CompositionStateChangeListener, PrivateChat {
@@ -87,8 +84,8 @@ public class Query extends MessageTarget implements PrivateActionListener,
      * @param urlBuilder          The URL builder to use when finding icons.
      */
     public Query(
-            @Unbound final Server newServer,
-            @Unbound final String newHost,
+            final Server newServer,
+            final String newHost,
             final TabCompleterFactory tabCompleterFactory,
             final CommandController commandController,
             final MessageSinkManager messageSinkManager,

src/com/dmdirc/QueryFactory.java

@@ -0,0 +1,59 @@
+/*
+ * 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.interfaces.CommandController;
+import com.dmdirc.messages.MessageSinkManager;
+import com.dmdirc.ui.input.TabCompleterFactory;
+import com.dmdirc.util.URLBuilder;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+/**
+ * Factory for {@link Query}s.
+ */
+@Singleton
+public class QueryFactory {
+
+    private final TabCompleterFactory tabCompleterFactory;
+    private final CommandController commandController;
+    private final MessageSinkManager messageSinkManager;
+    private final URLBuilder urlBuilder;
+
+    @Inject
+    public QueryFactory(final TabCompleterFactory tabCompleterFactory,
+            final CommandController commandController, final MessageSinkManager messageSinkManager,
+            final URLBuilder urlBuilder) {
+        this.tabCompleterFactory = tabCompleterFactory;
+        this.commandController = commandController;
+        this.messageSinkManager = messageSinkManager;
+        this.urlBuilder = urlBuilder;
+    }
+
+    public Query getQuery(final Server server, final String host) {
+        return new Query(server, host, tabCompleterFactory, commandController,
+                messageSinkManager, urlBuilder);
+    }
+
+}

src/com/dmdirc/Raw.java

@@ -34,8 +34,6 @@ import com.dmdirc.parser.interfaces.callbacks.DataInListener;
 import com.dmdirc.parser.interfaces.callbacks.DataOutListener;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.util.URLBuilder;
-import com.dmdirc.util.annotations.factory.Factory;
-import com.dmdirc.util.annotations.factory.Unbound;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -44,7 +42,6 @@ import java.util.Date;
  * Handles the raw window (which shows the user raw data being sent and received to/from the
  * server).
  */
-@Factory(inject = true, providers = true, singleton = true)
 public class Raw extends FrameContainer implements DataInListener, DataOutListener {
 
     /** The server object that's being monitored. */
@@ -59,7 +56,7 @@ public class Raw extends FrameContainer implements DataInListener, DataOutListen
      * @param urlBuilder         The URL builder to use when finding icons.
      */
     public Raw(
-            @Unbound final Server newServer,
+            final Server newServer,
             final CommandController commandController,
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder) {

src/com/dmdirc/RawFactory.java

@@ -0,0 +1,55 @@
+/*
+ * 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.interfaces.CommandController;
+import com.dmdirc.messages.MessageSinkManager;
+import com.dmdirc.util.URLBuilder;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+/**
+ * Factory for {@link Raw}s.
+ */
+@Singleton
+public class RawFactory {
+
+    private final CommandController commandController;
+    private final MessageSinkManager messageSinkManager;
+    private final URLBuilder urlBuilder;
+
+    @Inject
+    public RawFactory(final CommandController commandController,
+            final MessageSinkManager messageSinkManager,
+            final URLBuilder urlBuilder) {
+        this.commandController = commandController;
+        this.messageSinkManager = messageSinkManager;
+        this.urlBuilder = urlBuilder;
+    }
+
+    public Raw getRaw(final Server server) {
+        return new Raw(server, commandController, messageSinkManager, urlBuilder);
+    }
+
+}