Start to remove lombok :(

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

ivy.xml

@@ -18,6 +18,7 @@
         <dependency org="ch.qos.logback" name="logback-classic" rev="1.+" conf="test->default" />
 
         <dependency org="org.projectlombok" name="lombok" rev="latest.integration" conf="main->default" />
+
         <dependency org="com.dmdirc" name="annotations" rev="[0.3.4,)" conf="main->default" />
         <dependency org="com.google.code.findbugs" name="jsr305" rev="2.+" conf="main->default" />
 

nbproject/project.properties

@@ -14,6 +14,8 @@ auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.class
 auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.countForUsingStaticStarImport=1
 auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.importGroupsOrder=com.dmdirc;com.google;com.palantir;java;javax;lombok;net.miginfocom;org;*;static *
 auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.separateStaticImports=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.wrapOneLineComment=false
+auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
 endorsed.classpath=
 javac.classpath=
 javac.processorpath=\

src/com/dmdirc/Channel.java

@@ -57,8 +57,6 @@ import java.util.Map;
 
 import javax.annotation.Nonnull;
 
-import lombok.Getter;
-
 /**
  * The Channel class represents the client's view of the channel. It handles
  * callbacks for channel events from the parser, maintains the corresponding
@@ -71,14 +69,12 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
     private final ListenerList listenerList = new ListenerList();
 
     /** The parser's pChannel class. */
-    @Getter
     private ChannelInfo channelInfo;
 
     /** The server this channel is on. */
     private final Server server;
 
     /** The tabcompleter used for this channel. */
-    @Getter
     private final TabCompleter tabCompleter;
 
     /** A list of previous topics we've seen. */
@@ -91,7 +87,6 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
     private final ConfigProviderMigrator configMigrator;
 
     /** Whether we're in this channel or not. */
-    @Getter
     private boolean isOnChannel;
 
     /** Whether we should send WHO requests for this channel. */
@@ -154,6 +149,18 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
         selfJoin();
     }
 
+    public ChannelInfo getChannelInfo() {
+        return channelInfo;
+    }
+
+    public TabCompleter getTabCompleter() {
+        return tabCompleter;
+    }
+
+    public boolean isOnChannel() {
+        return isOnChannel;
+    }
+
     /**
      * Registers callbacks with the parser for this channel.
      */

src/com/dmdirc/ChannelEventHandler.java

@@ -35,12 +35,9 @@ import com.dmdirc.parser.interfaces.callbacks.*; //NOPMD
 
 import java.util.Date;
 
-import lombok.AllArgsConstructor;
-
 /**
  * Handles events for channel objects.
  */
-@AllArgsConstructor
 public class ChannelEventHandler extends EventHandler implements
         ChannelMessageListener, ChannelNamesListener, ChannelTopicListener,
         ChannelJoinListener, ChannelPartListener, ChannelKickListener,
@@ -53,6 +50,10 @@ public class ChannelEventHandler extends EventHandler implements
     /** The channel that owns this event handler. */
     private final Channel owner;
 
+    public ChannelEventHandler(final Channel owner) {
+        this.owner = owner;
+    }
+
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
     @Override

src/com/dmdirc/FrameContainer.java

@@ -51,20 +51,16 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import lombok.Getter;
-
 /**
  * The frame container implements basic methods that should be present in
  * all objects that handle a frame.
  */
-@SuppressWarnings("PMD.UnusedPrivateField")
 public abstract class FrameContainer {
 
     /** Listeners not yet using ListenerSupport. */
     protected final ListenerList listeners = new ListenerList();
 
     /** The colour of our frame's notifications. */
-    @Getter
     private Colour notification = Colour.BLACK;
 
     /** The document used to store this container's content. */
@@ -75,23 +71,18 @@ public abstract class FrameContainer {
             = new CopyOnWriteArrayList<>();
 
     /** The parent of this frame. */
-    @Getter
     private FrameContainer parent;
 
     /** The name of the icon being used for this container's frame. */
-    @Getter
     private String icon;
 
     /** The name of this container. */
-    @Getter
     private String name;
 
     /** The title of this container. */
-    @Getter
     private String title;
 
     /** The config manager for this container. */
-    @Getter
     private final AggregateConfigProvider configManager;
 
     /** The IconChanger for this container. */
@@ -134,6 +125,30 @@ public abstract class FrameContainer {
         setIcon(icon);
     }
 
+    public Colour getNotification() {
+        return notification;
+    }
+
+    public FrameContainer getParent() {
+        return parent;
+    }
+
+    public String getIcon() {
+        return icon;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public AggregateConfigProvider getConfigManager() {
+        return configManager;
+    }
+
     /**
      * Returns a collection of direct children of this frame.
      *

src/com/dmdirc/GlobalWindow.java

@@ -41,8 +41,6 @@ import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.inject.Singleton;
 
-import lombok.Getter;
-
 /**
  * A window which can be used to execute global commands.
  */
@@ -52,8 +50,6 @@ public class GlobalWindow extends WritableFrameContainer {
     private static GlobalWindow globalWindow;
 
     /** The tab completer we use. */
-    @Getter
-    @SuppressWarnings("PMD.UnusedPrivateField")
     private final TabCompleter tabCompleter;
 
     /**
@@ -77,6 +73,10 @@ public class GlobalWindow extends WritableFrameContainer {
         tabCompleter = tabCompleterFactory.getTabCompleter(config, CommandType.TYPE_GLOBAL);
     }
 
+    public TabCompleter getTabCompleter() {
+        return tabCompleter;
+    }
+
     /** {@inheritDoc} */
     @Override
     public void windowClosing() {

src/com/dmdirc/Invite.java

@@ -26,23 +26,18 @@ import com.dmdirc.interfaces.Connection;
 
 import java.util.Date;
 
-import lombok.Getter;
-
 /**
  * Model for a channel invitation.
  */
-@SuppressWarnings("PMD.UnusedPrivateField")
 public class Invite {
 
     /** The connection this invite was on. */
     private final Connection connection;
 
     /** The channel this invite is for. */
-    @Getter
     private final String channel;
 
     /** The time this invite was created. */
-    @Getter
     private final long timestamp;
 
     /** The source of this invite. */
@@ -62,6 +57,14 @@ public class Invite {
         this.timestamp = new Date().getTime();
     }
 
+    public String getChannel() {
+        return channel;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
     /**
      * Retrieves the source of this invite.
      *

src/com/dmdirc/Server.java

@@ -85,8 +85,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import javax.net.ssl.TrustManager;
 
-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;
 
@@ -95,10 +94,11 @@ import static com.google.common.base.Preconditions.checkNotNull;
  * a list of all channels, queries, etc, and handles parser callbacks pertaining
  * to the server.
  */
-@Slf4j
 @Factory(inject = true, singleton = true, providers = true, name = "ServerFactoryImpl")
 public class Server extends WritableFrameContainer implements ConfigChangeListener,
         CertificateProblemListener, Connection {
+    
+    private static final org.slf4j.Logger log = LoggerFactory.getLogger(Server.class);
 
     /** The name of the general domain. */
     private static final String DOMAIN_GENERAL = "general";

src/com/dmdirc/plugins/PluginInjectorInitialiser.java

@@ -53,7 +53,7 @@ import lombok.RequiredArgsConstructor;
  * Eventually this should be replaced by using the same DI framework for plugins
  * as for the client.
  */
-@RequiredArgsConstructor(onConstructor = @_(@Inject))
+@RequiredArgsConstructor(onConstructor = @__(@Inject))
 public class PluginInjectorInitialiser {
 
     private final ActionManager actionManager;

src/com/dmdirc/util/URLBuilder.java

@@ -33,9 +33,6 @@ import java.net.URL;
 import javax.inject.Inject;
 import javax.inject.Provider;
 
-import lombok.Getter;
-import lombok.Setter;
-
 /**
  * Provides methods for building URLs to reference DMDirc resources.
  */
@@ -43,9 +40,6 @@ public class URLBuilder {
 
     /** Singleton instance. */
     @Deprecated
-    @Getter
-    @Setter
-    @SuppressWarnings("PMD.UnusedPrivateField")
     private static URLBuilder instance;
 
     /** Provider to retrieve a plugin manager instance when needed. */
@@ -68,6 +62,14 @@ public class URLBuilder {
         this.themeManagerProvider = themeManagerProvider;
     }
 
+    public static URLBuilder getInstance() {
+        return instance;
+    }
+
+    public static void setInstance(final URLBuilder instance) {
+        URLBuilder.instance = instance;
+    }
+
     /**
      * Constructs an URL pointing to the specified resource on the file system.
      *