Add a MessageEncoder factory.

Tidy up some Server code based on IDEA inspections.

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

src/com/dmdirc/MessageEncoder.java

@@ -26,8 +26,6 @@ import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.parser.interfaces.Encoder;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.util.annotations.factory.Factory;
-import com.dmdirc.util.annotations.factory.Unbound;
 
 import com.google.common.eventbus.EventBus;
 
@@ -37,7 +35,6 @@ import java.io.UnsupportedEncodingException;
  * An {@link Encoder} implementation that reads the desired encoding from the relevant target's
  * config file.
  */
-@Factory(inject = true)
 public class MessageEncoder implements Encoder {
 
     /** The server that owns this encoder. */
@@ -54,7 +51,7 @@ public class MessageEncoder implements Encoder {
      * @param parser   The parser that this encoder will work for
      * @param eventBus The event bus to post errors to.
      */
-    public MessageEncoder(@Unbound final Server server, @Unbound final Parser parser,
+    public MessageEncoder(final Server server, final Parser parser,
             final EventBus eventBus) {
         this.server = server;
         this.parser = parser;

src/com/dmdirc/MessageEncoderFactory.java

@@ -0,0 +1,27 @@
+package com.dmdirc;
+
+import com.dmdirc.parser.interfaces.Parser;
+
+import com.google.common.eventbus.EventBus;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+/**
+ * Factory for {@link MessageEncoder}s.
+ */
+@Singleton
+public class MessageEncoderFactory {
+
+    private final EventBus eventBus;
+
+    @Inject
+    public MessageEncoderFactory(final EventBus eventBus) {
+        this.eventBus = eventBus;
+    }
+
+    public MessageEncoder getMessageEncoder(final Server server, final Parser parser) {
+        return new MessageEncoder(server, parser, eventBus);
+    }
+
+}

src/com/dmdirc/Server.java

@@ -749,11 +749,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
             return parser.compareURI(uri);
         }
 
-        if (oldParser != null) {
-            return oldParser.compareURI(uri);
-        }
-
-        return false;
+        return oldParser != null && oldParser.compareURI(uri);
     }
 
     @Override
@@ -924,11 +920,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
         synchronized (myStateLock) {
             try {
                 parserLock.readLock().lock();
-                if (parser == null) {
-                    return false;
-                } else {
-                    return getNetwork().equalsIgnoreCase(target);
-                }
+                return parser != null && getNetwork().equalsIgnoreCase(target);
             } finally {
                 parserLock.readLock().unlock();
             }
@@ -1355,11 +1347,6 @@ public class Server extends FrameContainer implements ConfigChangeListener,
                         + "connecting\n\n" + myState.getTransitionHistory());
             }
 
-            if (myState.getState() != ServerState.CONNECTING) {
-                // We've transitioned while waiting for the lock. Just abort.
-                return;
-            }
-
             myState.transition(ServerState.CONNECTED);
 
             configMigrator.migrate(address.getScheme(),
@@ -1397,8 +1384,8 @@ public class Server extends FrameContainer implements ConfigChangeListener,
                 + parser.getParameterChannelModes() + parser.getDoubleParameterChannelModes();
         final String umodes = parser.getUserModes();
 
-        final StringBuffer missingModes = new StringBuffer();
-        final StringBuffer missingUmodes = new StringBuffer();
+        final StringBuilder missingModes = new StringBuilder();
+        final StringBuilder missingUmodes = new StringBuilder();
 
         for (char mode : modes.toCharArray()) {
             if (!getConfigManager().hasOptionString(DOMAIN_SERVER, "mode" + mode)) {