Remove lombok

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

src/com/dmdirc/commandparser/parsers/CommandParser.java

@@ -43,8 +43,6 @@ import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
-import lombok.Getter;
-
 /**
  * Represents a generic command parser. A command parser takes a line of input
  * from the user, determines if it is an attempt at executing a command (based
@@ -70,7 +68,6 @@ public abstract class CommandParser implements Serializable {
     private final RollingList<PreviousCommand> history;
 
     /** Command manager to use. */
-    @Getter
     protected final CommandController commandManager;
 
     /**
@@ -87,6 +84,10 @@ public abstract class CommandParser implements Serializable {
         loadCommands();
     }
 
+    public CommandController getCommandManager() {
+        return commandManager;
+    }
+
     /**
      * Sets the owner of this command parser.
      *

src/com/dmdirc/config/ConfigBinder.java

@@ -38,14 +38,10 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-import lombok.AllArgsConstructor;
-import lombok.Synchronized;
-
 /**
  * Facilitates automatically binding fields or methods annotated with a
  * {@link ConfigBinding} element to a configuration value.
  */
-@AllArgsConstructor
 public class ConfigBinder {
 
     /** A map of instances to created listeners. */
@@ -54,6 +50,10 @@ public class ConfigBinder {
     /** The configuration manager to use to retrieve settings. */
     private final AggregateConfigProvider manager;
 
+    public ConfigBinder(final AggregateConfigProvider manager) {
+        this.manager = manager;
+    }
+
     /**
      * Binds all annotated methods and fields of the given instance to this
      * binder's configuration manager.
@@ -208,10 +208,11 @@ public class ConfigBinder {
      * @param instance The instance to add listeners for
      * @param newListeners The listeners to be added
      */
-    @Synchronized
     private void addListeners(final Object instance,
             final Collection<ConfigChangeListener> newListeners) {
-        listeners.add(instance, newListeners);
+        synchronized (listeners) {
+            listeners.add(instance, newListeners);
+        }
     }
 
     /**
@@ -220,12 +221,13 @@ public class ConfigBinder {
      *
      * @param instance The instance to be unbound
      */
-    @Synchronized
     public void unbind(final Object instance) {
-        for (ConfigChangeListener listener : listeners.safeGet(instance)) {
-            manager.removeListener(listener);
-        }
+        synchronized (listeners) {
+            for (ConfigChangeListener listener : listeners.safeGet(instance)) {
+                manager.removeListener(listener);
+            }
 
-        listeners.remove(instance);
+            listeners.remove(instance);
+        }
     }
 }

src/com/dmdirc/config/ConfigFileBackedConfigProvider.java

@@ -42,14 +42,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import lombok.extern.slf4j.Slf4j;
+import org.slf4j.LoggerFactory;
 
 /**
  * Provides configuration settings from a {@link ConfigFile}.
  */
-@Slf4j
 public class ConfigFileBackedConfigProvider extends BaseConfigProvider implements ConfigProvider {
 
+    private static final org.slf4j.Logger log = LoggerFactory.getLogger(ConfigFileBackedConfigProvider.class);
+
     /** The domain used for identity settings. */
     private static final String DOMAIN = "identity";
 

src/com/dmdirc/config/ConfigManager.java

@@ -39,17 +39,16 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
+import org.slf4j.LoggerFactory;
 
 /**
  * The config manager manages the various config sources for each entity.
  */
-@Slf4j
-@SuppressWarnings("PMD.UnusedPrivateField")
 public class ConfigManager extends BaseConfigProvider implements ConfigChangeListener,
         ConfigProviderListener, AggregateConfigProvider {
 
+    private static final org.slf4j.Logger log = LoggerFactory.getLogger(ConfigManager.class);
+
     /** Temporary map for lookup stats. */
     private static final Map<String, Integer> STATS = new TreeMap<>();
 
@@ -63,7 +62,6 @@ public class ConfigManager extends BaseConfigProvider implements ConfigChangeLis
     private final MapList<String, ConfigChangeListener> listeners = new MapList<>();
 
     /** The config binder to use for this manager. */
-    @Getter
     private final ConfigBinder binder = new ConfigBinder(this);
 
     /** The protocol this manager is for. */
@@ -124,6 +122,10 @@ public class ConfigManager extends BaseConfigProvider implements ConfigChangeLis
         IdentityManager.getIdentityManager().registerIdentityListener(this);
     }
 
+    public ConfigBinder getBinder() {
+        return binder;
+    }
+
     /** {@inheritDoc} */
     @Override
     public String getOption(final String domain, final String option,

src/com/dmdirc/config/IdentityManager.java

@@ -48,7 +48,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import lombok.extern.slf4j.Slf4j;
+import org.slf4j.LoggerFactory;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -57,9 +57,10 @@ import static com.google.common.base.Preconditions.checkNotNull;
  * The identity manager manages all known identities, providing easy methods
  * to access them.
  */
-@Slf4j
 public class IdentityManager implements IdentityFactory, IdentityController {
 
+    private static final org.slf4j.Logger log = LoggerFactory.getLogger(IdentityManager.class);
+
     /** A regular expression that will match all characters illegal in file names. */
     private static final String ILLEGAL_CHARS = "[\\\\\"/:\\*\\?\"<>\\|]";