Remove more lombok

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

src/com/dmdirc/Server.java

@@ -97,7 +97,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 @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. */

src/com/dmdirc/commandparser/BaseCommandInfo.java

@@ -22,16 +22,10 @@
 
 package com.dmdirc.commandparser;
 
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
 /**
  * A basic {@link CommandInfo} implementation whose parameters can be
  * configured via the constructor.
  */
-@Getter
-@RequiredArgsConstructor
-@SuppressWarnings("PMD.UnusedPrivateField")
 public class BaseCommandInfo implements CommandInfo {
 
     /** The name of the command. */
@@ -43,4 +37,22 @@ public class BaseCommandInfo implements CommandInfo {
     /** The type of the command. */
     private final CommandType type;
 
+    public BaseCommandInfo(final String name, final String help, final CommandType type) {
+        this.name = name;
+        this.help = help;
+        this.type = type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getHelp() {
+        return help;
+    }
+
+    public CommandType getType() {
+        return type;
+    }
+
 }

src/com/dmdirc/commandparser/CommandInfoPair.java

@@ -24,18 +24,12 @@ package com.dmdirc.commandparser;
 
 import com.dmdirc.commandparser.commands.Command;
 
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
 /**
  * A combination of a {@link Command} and the {@link CommandInfo} which
  * triggered it.
  *
  * @since 0.6.4
  */
-@RequiredArgsConstructor
-@Getter
-@SuppressWarnings("PMD.UnusedPrivateField")
 public class CommandInfoPair {
 
     /** The command info which caused the command to be triggered. */
@@ -44,4 +38,17 @@ public class CommandInfoPair {
     /** The command in question. */
     private final Command command;
 
+    public CommandInfoPair(final CommandInfo commandInfo, final Command command) {
+        this.commandInfo = commandInfo;
+        this.command = command;
+    }
+
+    public CommandInfo getCommandInfo() {
+        return commandInfo;
+    }
+
+    public Command getCommand() {
+        return command;
+    }
+
 }

src/com/dmdirc/commandparser/CommandManager.java

@@ -39,13 +39,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import lombok.Getter;
-
 /**
  * The command manager creates and manages a single instance of all commands,
  * and provides methods to load each group of commands into a parser instance.
  */
-@SuppressWarnings("PMD.UnusedPrivateField")
 public class CommandManager implements CommandController {
 
     /** A list of commands that have been instantiated. */
@@ -61,12 +58,10 @@ public class CommandManager implements CommandController {
 
     /** The command char we're using. */
     @ConfigBinding(domain="general", key="commandchar")
-    @Getter
     private char commandChar;
 
     /** The silence char we're using. */
     @ConfigBinding(domain="general", key="silencechar")
-    @Getter
     private char silenceChar;
 
     /**
@@ -78,6 +73,14 @@ public class CommandManager implements CommandController {
         this.serverManager = serverManager;
     }
 
+    public char getCommandChar() {
+        return commandChar;
+    }
+
+    public char getSilenceChar() {
+        return silenceChar;
+    }
+
     /**
      * Initialises the command manager.
      *

src/com/dmdirc/commandparser/commands/Command.java

@@ -28,14 +28,9 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.messages.Styliser;
 
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
 /**
  * Represents a generic command.
  */
-@RequiredArgsConstructor
 public abstract class Command {
 
     /** The format name used for command output. */
@@ -45,9 +40,16 @@ public abstract class Command {
     protected static final String FORMAT_ERROR = "commandError";
 
     /** The controller this command is associated with. */
-    @Getter(AccessLevel.PROTECTED)
     private final CommandController controller;
 
+    public Command(final CommandController controller) {
+        this.controller = controller;
+    }
+
+    protected CommandController getController() {
+        return controller;
+    }
+
     /**
      * Sends a line, if appropriate, to the specified target.
      * @param target The command window to send the line to

src/com/dmdirc/commandparser/commands/CommandModule.java

@@ -72,9 +72,6 @@ import com.dmdirc.interfaces.CommandController.CommandDetails;
 import java.util.HashSet;
 import java.util.Set;
 
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
 import dagger.Module;
 import dagger.Provides;
 
@@ -565,10 +562,21 @@ public class CommandModule {
     /**
      * Simple implementation of {@link CommandDetails}.
      */
-    @Getter
-    @RequiredArgsConstructor
     private static class SimpleCommandDetails implements CommandDetails {
 
+        public SimpleCommandDetails(Command command, CommandInfo info) {
+            this.command = command;
+            this.info = info;
+        }
+
+        public Command getCommand() {
+            return command;
+        }
+
+        public CommandInfo getInfo() {
+            return info;
+        }
+
         /** The command. */
         private final Command command;
 

src/com/dmdirc/commandparser/commands/IntelligentCommand.java

@@ -27,9 +27,6 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import java.util.List;
 
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
 /**
  * Intelligent commands implement a method that provides a list of possible
  * options for them, for use (for example) by table completers.
@@ -52,11 +49,28 @@ public interface IntelligentCommand {
      *
      * @since 0.6.4
      */
-    @RequiredArgsConstructor
-    @Getter
     @SuppressWarnings("PMD.UnusedPrivateField")
     class IntelligentCommandContext {
 
+        public IntelligentCommandContext(final WritableFrameContainer window,
+                final List<String> previousArgs, final String partial) {
+            this.window = window;
+            this.previousArgs = previousArgs;
+            this.partial = partial;
+        }
+
+        public WritableFrameContainer getWindow() {
+            return window;
+        }
+
+        public List<String> getPreviousArgs() {
+            return previousArgs;
+        }
+
+        public String getPartial() {
+            return partial;
+        }
+
         /** The window the command is being entered in. */
         private final WritableFrameContainer window;
 

src/com/dmdirc/commandparser/commands/PreviousCommand.java

@@ -23,18 +23,11 @@
 package com.dmdirc.commandparser.commands;
 
 import java.util.Date;
-
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
+import java.util.Objects;
 
 /**
  * Stores information about a previously executed command.
  */
-@RequiredArgsConstructor
-@EqualsAndHashCode
-@Getter
-@SuppressWarnings("PMD.UnusedPrivateField")
 public final class PreviousCommand {
 
     /** The full command that was executed. */
@@ -43,4 +36,36 @@ public final class PreviousCommand {
     /** The timestamp of its execution. */
     private final long time = new Date().getTime();
 
+    public PreviousCommand(final String line) {
+        this.line = line;
+    }
+
+    public String getLine() {
+        return line;
+    }
+
+    public long getTime() {
+        return time;
+    }
+
+    @Override
+    public int hashCode() {
+        return (int) (time ^ (time >>> 32)) + (line == null ? 0 : line.hashCode());
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final PreviousCommand other = (PreviousCommand) obj;
+        if (!Objects.equals(this.line, other.line)) {
+            return false;
+        }
+        return this.time == other.time;
+    }
+
 }