Merge pull request #76 from csmith/master

Start using dagger.

.gitignore

 /etc/nexus-teamcity.properties
 /.gradle
 /*/build
+/*/generated
 /nexus-teamcity.gradle

irc/src/com/dmdirc/parser/irc/IRCParser.java

 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 
+import dagger.ObjectGraph;
+
 /**
  * IRC Parser.
  */
     public IRCParser(final MyInfo myDetails, final URI uri) {
         super(uri);
 
-        myProcessingManager = new ProcessingManager(this, prefixModes, userModes, chanModesBool);
+        // TODO: There should be a factory or builder for parsers that can construct the graph
+        final ObjectGraph graph = ObjectGraph.create(new IRCParserModule(this, prefixModes,
+                userModes, chanModesBool));
+        myProcessingManager = graph.get(ProcessingManager.class);
         myself = new IRCClientInfo(this, userModes, "myself").setFake(true);
 
         out = new OutputQueue();

irc/src/com/dmdirc/parser/irc/IRCParserModule.java

+/*
+ * 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.parser.irc;
+
+import com.dmdirc.parser.irc.processors.ProcessorsModule;
+
+import javax.inject.Named;
+
+import dagger.Module;
+import dagger.Provides;
+
+/**
+ * Dagger module for injecting the main IRC parser and its dependencies.
+ */
+@Module(includes = ProcessorsModule.class, injects = ProcessingManager.class)
+public class IRCParserModule {
+
+    private final IRCParser parser;
+    private final PrefixModeManager prefixModeManager;
+    private final ModeManager userModeManager;
+    private final ModeManager chanModeManager;
+
+    public IRCParserModule(final IRCParser parser, final PrefixModeManager prefixModeManager,
+            final ModeManager userModeManager, final ModeManager chanModeManager) {
+        // TODO: Make all of these things injected.
+        this.parser = parser;
+        this.prefixModeManager = prefixModeManager;
+        this.userModeManager = userModeManager;
+        this.chanModeManager = chanModeManager;
+    }
+
+    @Provides
+    public IRCParser getParser() {
+        return parser;
+    }
+
+    @Provides
+    public PrefixModeManager getPrefixModeManager() {
+        return prefixModeManager;
+    }
+
+    @Provides
+    @Named("user")
+    public ModeManager getUserModeManager() {
+        return userModeManager;
+    }
+
+    @Provides
+    @Named("channel")
+    public ModeManager getChanModeManager() {
+        return chanModeManager;
+    }
+
+}

irc/src/com/dmdirc/parser/irc/ProcessingManager.java

 import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.events.NumericEvent;
 import com.dmdirc.parser.irc.processors.IRCProcessor;
-import com.dmdirc.parser.irc.processors.Process001;
-import com.dmdirc.parser.irc.processors.Process004005;
-import com.dmdirc.parser.irc.processors.Process464;
-import com.dmdirc.parser.irc.processors.ProcessAccount;
-import com.dmdirc.parser.irc.processors.ProcessAway;
-import com.dmdirc.parser.irc.processors.ProcessCap;
-import com.dmdirc.parser.irc.processors.ProcessInvite;
-import com.dmdirc.parser.irc.processors.ProcessJoin;
-import com.dmdirc.parser.irc.processors.ProcessKick;
-import com.dmdirc.parser.irc.processors.ProcessList;
-import com.dmdirc.parser.irc.processors.ProcessListModes;
-import com.dmdirc.parser.irc.processors.ProcessMOTD;
-import com.dmdirc.parser.irc.processors.ProcessMessage;
-import com.dmdirc.parser.irc.processors.ProcessMode;
-import com.dmdirc.parser.irc.processors.ProcessNames;
-import com.dmdirc.parser.irc.processors.ProcessNick;
-import com.dmdirc.parser.irc.processors.ProcessNickInUse;
-import com.dmdirc.parser.irc.processors.ProcessNoticeAuth;
-import com.dmdirc.parser.irc.processors.ProcessPart;
-import com.dmdirc.parser.irc.processors.ProcessQuit;
-import com.dmdirc.parser.irc.processors.ProcessTopic;
-import com.dmdirc.parser.irc.processors.ProcessWallops;
-import com.dmdirc.parser.irc.processors.ProcessWho;
 
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
+
+import javax.inject.Inject;
 
 /**
  * IRC Parser Processing Manager.
      * Constructor to create a ProcessingManager.
      *
      * @param parser IRCParser that owns this Processing Manager
-     * @param prefixModeManager The manager to use to access prefix modes.
-     * @param userModeManager Mode manager to use for user modes.
-     * @param chanModeManager Mode manager to use for channel modes.
+     * @param processors The processors to add.
      */
-    public ProcessingManager(final IRCParser parser, final PrefixModeManager prefixModeManager,
-            final ModeManager userModeManager, final ModeManager chanModeManager) {
+    @Inject
+    public ProcessingManager(final IRCParser parser, final Set<IRCProcessor> processors) {
         this.parser = parser;
-        //------------------------------------------------
-        // Add processors
-        //------------------------------------------------
-        // NOTICE AUTH
-        addProcessor(new ProcessNoticeAuth(parser));
-        // 001
-        addProcessor(new Process001(parser));
-        // 004
-        // 005
-        addProcessor(new Process004005(parser));
-        // 464
-        addProcessor(new Process464(parser));
-        // 301
-        // 305
-        // 306
-        addProcessor(new ProcessAway(parser));
-        // 352
-        addProcessor(new ProcessWho(parser));
-        // INVITE
-        addProcessor(new ProcessInvite(parser));
-        // JOIN
-        addProcessor(new ProcessJoin(parser, prefixModeManager, userModeManager, chanModeManager));
-        // KICK
-        addProcessor(new ProcessKick(parser));
-        // PRIVMSG
-        // NOTICE
-        addProcessor(new ProcessMessage(parser, prefixModeManager));
-        // MODE
-        // 324
-        addProcessor(new ProcessMode(parser, prefixModeManager, userModeManager, chanModeManager));
-        // 372
-        // 375
-        // 376
-        // 422
-        addProcessor(new ProcessMOTD(parser));
-        // 353
-        // 366
-        addProcessor(new ProcessNames(parser, prefixModeManager, userModeManager));
-        // 433
-        addProcessor(new ProcessNickInUse(parser));
-        // NICK
-        addProcessor(new ProcessNick(parser));
-        // PART
-        addProcessor(new ProcessPart(parser));
-        // QUIT
-        addProcessor(new ProcessQuit(parser));
-        // TOPIC
-        // 332
-        // 333
-        addProcessor(new ProcessTopic(parser));
-        // 344
-        // 345
-        // 346
-        // 347
-        // 348
-        // 349
-        // 367
-        // 368
-        addProcessor(new ProcessListModes(parser));
-        // WALLOPS
-        addProcessor(new ProcessWallops(parser));
-        // 321
-        // 322
-        // 323
-        addProcessor(new ProcessList(parser));
-        // CAP
-        addProcessor(new ProcessCap(parser));
-        // ACCOUNT
-        addProcessor(new ProcessAccount(parser));
+        processors.forEach(this::addProcessor);
     }
 
     /**
      * @param processor IRCProcessor subclass for the processor.
      */
     public void delProcessor(final IRCProcessor processor) {
-        IRCProcessor testProcessor;
         doDebug("Deleting processor: " + processor.getName());
         for (String elementName : processHash.keySet()) {
             doDebug("\t Checking handler for: " + elementName);
-            testProcessor = processHash.get(elementName);
+            final IRCProcessor testProcessor = processHash.get(elementName);
             if (testProcessor.getName().equalsIgnoreCase(processor.getName())) {
                 doDebug("\t Removed handler for: " + elementName);
                 processHash.remove(elementName);

irc/src/com/dmdirc/parser/irc/processors/Process001.java

 
 import java.util.Collection;
 
+import javax.inject.Inject;
+
 /**
  * Process a 001 message.
  */
      *
      * @param parser IRCParser That owns this IRCProcessor
      */
+    @Inject
     public Process001(final IRCParser parser) {
         super(parser, "001");
     }

irc/src/com/dmdirc/parser/irc/processors/Process004005.java

 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javax.inject.Inject;
+
 /**
  * Process ISUPPORT lines.
  */
      *
      * @param parser IRCParser That owns this IRCProcessor
      */
+    @Inject
     public Process004005(final IRCParser parser) {
         super(parser, "002", "003", "004", "005");
     }

irc/src/com/dmdirc/parser/irc/processors/Process464.java

 
 import java.util.Date;
 
+import javax.inject.Inject;
+
 /**
  * Process a 464 message.
  */
      *
      * @param parser IRCParser That owns this IRCProcessor
      */
+    @Inject
     public Process464(final IRCParser parser) {
         super(parser, "464");
     }

irc/src/com/dmdirc/parser/irc/processors/ProcessAccount.java

 import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
 
+import javax.inject.Inject;
+
 /**
  * Process an Account message.
  */
      *
      * @param parser IRCParser That owns this IRCProcessor
      */
+    @Inject
     public ProcessAccount(final IRCParser parser) {
         super(parser, "ACCOUNT");
     }

irc/src/com/dmdirc/parser/irc/processors/ProcessAway.java

 
 import java.util.Date;
 
+import javax.inject.Inject;
+
 /**
  * Process an Away/Back message.
  */
      *
      * @param parser IRCParser That owns this IRCProcessor
      */
+    @Inject
     public ProcessAway(final IRCParser parser) {
         super(parser, "301", "305", "306", "AWAY");
     }

irc/src/com/dmdirc/parser/irc/processors/ProcessCap.java

 import java.util.Collection;
 import java.util.Date;
 
+import javax.inject.Inject;
+
 /**
  * Process CAP extension.
  * There are currently no callbacks related to this, as it is just to tell
      *
      * @param parser IRCParser That owns this IRCProcessor
      */
+    @Inject
     public ProcessCap(final IRCParser parser) {
         super(parser, "CAP");
 

irc/src/com/dmdirc/parser/irc/processors/ProcessInvite.java

 
 import java.util.Date;
 
+import javax.inject.Inject;
+
 /**
  * Process an Invite Request.
  */
      *
      * @param parser IRCParser That owns this IRCProcessor
      */
+    @Inject
     public ProcessInvite(final IRCParser parser) {
         super(parser, "INVITE");
     }

irc/src/com/dmdirc/parser/irc/processors/ProcessJoin.java

 import java.util.Arrays;
 import java.util.Date;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+
 /**
  * Process a channel join.
  */
      * @param userModeManager Mode manager to use for user modes.
      * @param chanModeManager Mode manager to use for channel modes.
      */
+    @Inject
     public ProcessJoin(final IRCParser parser, final PrefixModeManager prefixModeManager,
-            final ModeManager userModeManager, final ModeManager chanModeManager) {
+            @Named("user") final ModeManager userModeManager,
+            @Named("channel") final ModeManager chanModeManager) {
         super(parser, "JOIN", "329");
         this.prefixModeManager = prefixModeManager;
         this.userModeManager = userModeManager;

irc/src/com/dmdirc/parser/irc/processors/ProcessKick.java

 import java.util.Arrays;
 import java.util.Date;
 
+import javax.inject.Inject;
+
 /**
  * Process a channel kick.
  */
      *
      * @param parser IRCParser That owns this IRCProcessor
      */
+    @Inject
     public ProcessKick(final IRCParser parser) {
         super(parser, "KICK");
     }

irc/src/com/dmdirc/parser/irc/processors/ProcessList.java

 
 import java.util.Date;
 
+import javax.inject.Inject;
+
 /**
  * Process a list response.
  */
      *
      * @param parser IRCParser That owns this IRCProcessor
      */
+    @Inject
     public ProcessList(final IRCParser parser) {
         super(parser, "321", "322", "323");
     }

irc/src/com/dmdirc/parser/irc/processors/ProcessListModes.java

 import java.util.Date;
 import java.util.Queue;
 
+import javax.inject.Inject;
+
 /**
  * Process a List Modes.
  */
      *
      * @param parser IRCParser That owns this IRCProcessor
      */
+    @Inject
     public ProcessListModes(final IRCParser parser) {
         super(parser, "367", "368", /* Bans */
                 "344", "345", /* Reop list (ircnet) or bad words (euirc) */

irc/src/com/dmdirc/parser/irc/processors/ProcessMOTD.java

 
 import java.util.Date;
 
+import javax.inject.Inject;
+
 /**
  * Process a MOTD Related Line.
  */
      *
      * @param parser IRCParser That owns this IRCProcessor
      */
+    @Inject
     public ProcessMOTD(final IRCParser parser) {
         super(parser, "372", "375", "376", "422");
     }

irc/src/com/dmdirc/parser/irc/processors/ProcessMessage.java

 import java.util.Date;
 import java.util.regex.PatternSyntaxException;
 
+import javax.inject.Inject;
+
 /**
  * Process PRIVMSGs and NOTICEs.
  * This horrible handles PRIVMSGs and NOTICE<br>
      * @param parser IRCParser That owns this IRCProcessor
      * @param prefixModeManager The manager to use to access prefix modes.
      */
+    @Inject
     public ProcessMessage(final IRCParser parser, final PrefixModeManager prefixModeManager) {
         super(parser, "PRIVMSG", "NOTICE");
         this.prefixModeManager = prefixModeManager;

irc/src/com/dmdirc/parser/irc/processors/ProcessMode.java

 import java.util.Calendar;
 import java.util.Date;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+
 /**
  * Process a Mode line.
  */
      * @param userModeManager Mode manager to use for user modes.
      * @param chanModeManager Mode manager to use for channel modes.
      */
+    @Inject
     public ProcessMode(final IRCParser parser, final PrefixModeManager prefixModeManager,
-            final ModeManager userModeManager, final ModeManager chanModeManager) {
+            @Named("user") final ModeManager userModeManager,
+            @Named("channel") final ModeManager chanModeManager) {
         super(parser, "MODE", "324", "221");
         this.prefixModeManager = prefixModeManager;
         this.userModeManager = userModeManager;

irc/src/com/dmdirc/parser/irc/processors/ProcessNames.java

 
 import java.util.Date;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+
 /**
  * Process a Names reply.
  */
      * @param prefixModeManager The manager to use to access prefix modes.
      * @param userModeManager Mode manager to use for user modes.
      */
+    @Inject
     public ProcessNames(final IRCParser parser, final PrefixModeManager prefixModeManager,
-            final ModeManager userModeManager) {
+            @Named("user") final ModeManager userModeManager) {
         super(parser, "353", "366");
         this.prefixModeManager = prefixModeManager;
         this.userModeManager = userModeManager;

irc/src/com/dmdirc/parser/irc/processors/ProcessNick.java

 
 import java.util.Date;
 
+import javax.inject.Inject;
+
 /**
  * Process a Nick change.
  */
      *
      * @param parser IRCParser That owns this IRCProcessor
      */
+    @Inject
     public ProcessNick(final IRCParser parser) {
         super(parser, "NICK");
     }

irc/src/com/dmdirc/parser/irc/processors/ProcessNickInUse.java

 
 import java.util.Date;
 
+import javax.inject.Inject;
+
 /**
  * Process a NickInUse message.
  * Parser implements handling of this if Pre-001 and no other handler found,
      *
      * @param parser IRCParser That owns this object
      */
+    @Inject
     public ProcessNickInUse(final IRCParser parser) {
         super(parser, "433");
     }

irc/src/com/dmdirc/parser/irc/processors/ProcessNoticeAuth.java

 
 import java.util.Date;
 
+import javax.inject.Inject;
+
 /**
  * Process a NoticeAuth message.
  */
      *
      * @param parser IRCParser That owns this object
      */
+    @Inject
     public ProcessNoticeAuth(final IRCParser parser) {
         super(parser, "Notice Auth");
     }

irc/src/com/dmdirc/parser/irc/processors/ProcessPart.java

 
 import java.util.Date;
 
+import javax.inject.Inject;
+
 /**
  * Process a channel part.
  */
      *
      * @param parser IRCParser That owns this IRCProcessor
      */
+    @Inject
     public ProcessPart(final IRCParser parser) {
         super(parser, "PART");
     }

irc/src/com/dmdirc/parser/irc/processors/ProcessQuit.java

 import java.util.ArrayList;
 import java.util.Date;
 
+import javax.inject.Inject;
+
 /**
  * Process a Quit message.
  */
      *
      * @param parser IRCParser That owns this IRCProcessor
      */
+    @Inject
     public ProcessQuit(final IRCParser parser) {
         super(parser, "QUIT");
     }

irc/src/com/dmdirc/parser/irc/processors/ProcessTopic.java

 
 import java.util.Date;
 
+import javax.inject.Inject;
+
 /**
  * Process a topic change.
  */
      *
      * @param parser IRCParser That owns this IRCProcessor
      */
+    @Inject
     public ProcessTopic(final IRCParser parser) {
         super(parser, "TOPIC", "332", "333");
     }

irc/src/com/dmdirc/parser/irc/processors/ProcessWallops.java

 
 import java.util.Date;
 
+import javax.inject.Inject;
+
 /**
  * Process a WALLOPS Message.
  */
      *
      * @param parser IRCParser That owns this IRCProcessor
      */
+    @Inject
     public ProcessWallops(final IRCParser parser) {
         super(parser, "WALLOPS");
     }

irc/src/com/dmdirc/parser/irc/processors/ProcessWho.java

 
 import java.util.Date;
 
+import javax.inject.Inject;
+
 /**
  * Process a /who reply.
  */
      *
      * @param parser IRCParser That owns this IRCProcessor
      */
+    @Inject
     public ProcessWho(final IRCParser parser) {
         super(parser, "352");
     }

irc/src/com/dmdirc/parser/irc/processors/ProcessorsModule.java

+/*
+ * 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.parser.irc.processors;
+
+import dagger.Module;
+import dagger.Provides;
+
+/**
+ * Dagger module that supplies a set of processors.
+ */
+@Module(library = true, complete = false)
+public class ProcessorsModule {
+
+    @Provides(type = Provides.Type.SET)
+    public IRCProcessor getProcessor(final Process001 processor) {
+        return processor;
+    }
+
+    @Provides(type = Provides.Type.SET)
+    public IRCProcessor getProcessor(final Process464 processor) {
+        return processor;
+    }
+
+    @Provides(type = Provides.Type.SET)
+    public IRCProcessor getProcessor(final Process004005 processor) {
+        return processor;
+    }
+
+    @Provides(type = Provides.Type.SET)
+    public IRCProcessor getProcessor(final ProcessAccount processor) {
+        return processor;
+    }
+
+    @Provides(type = Provides.Type.SET)
+    public IRCProcessor getProcessor(final ProcessAway processor) {
+        return processor;
+    }
+
+    @Provides(type = Provides.Type.SET)
+    public IRCProcessor getProcessor(final ProcessCap processor) {
+        return processor;
+    }
+
+    @Provides(type = Provides.Type.SET)
+    public IRCProcessor getProcessor(final ProcessInvite processor) {
+        return processor;
+    }
+
+    @Provides(type = Provides.Type.SET)
+    public IRCProcessor getProcessor(final ProcessJoin processor) {
+        return processor;
+    }
+
+    @Provides(type = Provides.Type.SET)
+    public IRCProcessor getProcessor(final ProcessKick processor) {
+        return processor;
+    }
+
+    @Provides(type = Provides.Type.SET)
+    public IRCProcessor getProcessor(final ProcessList processor) {
+        return processor;
+    }
+
+    @Provides(type = Provides.Type.SET)
+    public IRCProcessor getProcessor(final ProcessListModes processor) {
+        return processor;
+    }
+
+    @Provides(type = Provides.Type.SET)
+    public IRCProcessor getProcessor(final ProcessMessage processor) {
+        return processor;
+    }
+
+    @Provides(type = Provides.Type.SET)
+    public IRCProcessor getProcessor(final ProcessMode processor) {
+        return processor;
+    }
+
+    @Provides(type = Provides.Type.SET)
+    public IRCProcessor getProcessor(final ProcessMOTD processor) {
+        return processor;
+    }
+
+    @Provides(type = Provides.Type.SET)
+    public IRCProcessor getProcessor(final ProcessNames processor) {
+        return processor;
+    }
+
+    @Provides(type = Provides.Type.SET)
+    public IRCProcessor getProcessor(final ProcessNick processor) {
+        return processor;
+    }
+
+    @Provides(type = Provides.Type.SET)
+    public IRCProcessor getProcessor(final ProcessNickInUse processor) {
+        return processor;
+    }
+
+    @Provides(type = Provides.Type.SET)
+    public IRCProcessor getProcessor(final ProcessNoticeAuth processor) {
+        return processor;
+    }
+
+    @Provides(type = Provides.Type.SET)
+    public IRCProcessor getProcessor(final ProcessPart processor) {
+        return processor;
+    }
+
+    @Provides(type = Provides.Type.SET)
+    public IRCProcessor getProcessor(final ProcessQuit processor) {
+        return processor;
+    }
+
+    @Provides(type = Provides.Type.SET)
+    public IRCProcessor getProcessor(final ProcessTopic processor) {
+        return processor;
+    }
+
+    @Provides(type = Provides.Type.SET)
+    public IRCProcessor getProcessor(final ProcessWallops processor) {
+        return processor;
+    }
+
+    @Provides(type = Provides.Type.SET)
+    public IRCProcessor getProcessor(final ProcessWho processor) {
+        return processor;
+    }
+
+}