Bulk remove inheritDoc.

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

src/com/dmdirc/Channel.java

@@ -186,7 +186,6 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
                 server.getNetwork(), server.getAddress(), channelInfo.getName());
     }
 
-    /** {@inheritDoc} */
     @Override
     public void sendLine(final String line) {
         if (server.getState() != ServerState.CONNECTED
@@ -214,7 +213,6 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public int getMaxLineLength() {
         return server.getState() == ServerState.CONNECTED
@@ -222,7 +220,6 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
                 : -1;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void sendAction(final String action) {
         if (server.getState() != ServerState.CONNECTED
@@ -331,7 +328,6 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
                 .clientListUpdated(Collections.<ChannelClientInfo>emptyList());
     }
 
-    /** {@inheritDoc} */
     @Override
     public void close() {
         super.close();
@@ -447,7 +443,6 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void configChanged(final String domain, final String key) {
         switch (key) {
@@ -504,7 +499,6 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
         return res;
     }
 
-    /** {@inheritDoc} */
     @Override
     protected boolean processNotificationArg(final Object arg, final List<Object> args) {
         if (arg instanceof ClientInfo) {
@@ -539,7 +533,6 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     protected void modifyNotificationArgs(final List<Object> actionArgs,
             final List<Object> messageArgs) {
@@ -559,7 +552,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
         updateTitle();
 
         new Thread(new Runnable() {
-            /** {@inheritDoc} */
+
             @Override
             public void run() {
                 listenerList.getCallable(TopicChangeListener.class)
@@ -651,7 +644,6 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
         listenerList.remove(TopicChangeListener.class, listener);
     }
 
-    /** {@inheritDoc} */
     @Override
     @Nonnull
     public Connection getConnection() {

src/com/dmdirc/ChannelEventHandler.java

@@ -82,7 +82,6 @@ public class ChannelEventHandler extends EventHandler implements
         this.eventBus = eventBus;
     }
 
-    /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
     @Override
     protected <T extends CallbackInterface> void addCallback(final CallbackManager cbm,
@@ -94,7 +93,6 @@ public class ChannelEventHandler extends EventHandler implements
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     protected Connection getConnection() {
         return owner.getConnection();
@@ -111,7 +109,6 @@ public class ChannelEventHandler extends EventHandler implements
         return client.getClient().equals(owner.getConnection().getParser().getLocalClient());
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onChannelMessage(final Parser parser, final Date date,
             final ChannelInfo channel, final ChannelClientInfo client,
@@ -124,7 +121,6 @@ public class ChannelEventHandler extends EventHandler implements
         triggerAction(message, CoreActionType.CHANNEL_MESSAGE, client, message);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onChannelGotNames(final Parser parser, final Date date, final ChannelInfo channel) {
         checkParser(parser);
@@ -133,7 +129,6 @@ public class ChannelEventHandler extends EventHandler implements
         ActionManager.getActionManager().triggerEvent(CoreActionType.CHANNEL_GOTNAMES, null, owner);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onChannelTopic(final Parser parser, final Date date,
             final ChannelInfo channel, final boolean isJoinTopic) {
@@ -173,7 +168,6 @@ public class ChannelEventHandler extends EventHandler implements
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onChannelJoin(final Parser parser, final Date date, final ChannelInfo channel,
             final ChannelClientInfo client) {
@@ -184,7 +178,6 @@ public class ChannelEventHandler extends EventHandler implements
         owner.addClient(client);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onChannelPart(final Parser parser, final Date date, final ChannelInfo channel,
             final ChannelClientInfo client, final String reason) {
@@ -200,7 +193,6 @@ public class ChannelEventHandler extends EventHandler implements
         owner.removeClient(client);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onChannelKick(final Parser parser, final Date date, final ChannelInfo channel,
             final ChannelClientInfo kickedClient, final ChannelClientInfo client,
@@ -214,7 +206,6 @@ public class ChannelEventHandler extends EventHandler implements
         owner.removeClient(kickedClient);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onChannelQuit(final Parser parser, final Date date, final ChannelInfo channel,
             final ChannelClientInfo client, final String reason) {
@@ -227,7 +218,6 @@ public class ChannelEventHandler extends EventHandler implements
         owner.removeClient(client);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onChannelAction(final Parser parser, final Date date, final ChannelInfo channel,
             final ChannelClientInfo client, final String message,
@@ -241,7 +231,6 @@ public class ChannelEventHandler extends EventHandler implements
                 CoreActionType.CHANNEL_ACTION, client, message);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onChannelNickChanged(final Parser parser, final Date date,
             final ChannelInfo channel, final ChannelClientInfo client, final String oldNick) {
@@ -255,7 +244,6 @@ public class ChannelEventHandler extends EventHandler implements
         owner.renameClient(oldNick, client.getClient().getNickname());
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onChannelModeChanged(final Parser parser, final Date date,
             final ChannelInfo channel, final ChannelClientInfo client, final String host,
@@ -283,7 +271,6 @@ public class ChannelEventHandler extends EventHandler implements
         owner.refreshClients();
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onChannelUserModeChanged(final Parser parser, final Date date,
             final ChannelInfo channel, final ChannelClientInfo targetClient,
@@ -303,7 +290,6 @@ public class ChannelEventHandler extends EventHandler implements
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onChannelCTCP(final Parser parser, final Date date,
             final ChannelInfo channel, final ChannelClientInfo client,
@@ -317,7 +303,6 @@ public class ChannelEventHandler extends EventHandler implements
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onAwayStateOther(final Parser parser, final Date date,
             final ClientInfo client, final AwayState oldState, final AwayState state) {
@@ -341,7 +326,6 @@ public class ChannelEventHandler extends EventHandler implements
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onChannelNotice(final Parser parser, final Date date,
             final ChannelInfo channel, final ChannelClientInfo client,
@@ -353,7 +337,6 @@ public class ChannelEventHandler extends EventHandler implements
         triggerAction("channelNotice", CoreActionType.CHANNEL_NOTICE, client, message);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onChannelNonUserModeChanged(final Parser parser, final Date date,
             final ChannelInfo channel, final ChannelClientInfo client,
@@ -381,7 +364,6 @@ public class ChannelEventHandler extends EventHandler implements
         owner.refreshClients();
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onChannelModeNotice(final Parser parser, final Date date,
             final ChannelInfo channel, final char prefix,
@@ -395,7 +377,6 @@ public class ChannelEventHandler extends EventHandler implements
                 valueOf(prefix), message);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onChannelGotListModes(final Parser parser, final Date date,
             final ChannelInfo channel, final char mode) {

src/com/dmdirc/CorePluginExtractor.java

@@ -79,7 +79,7 @@ public class CorePluginExtractor {
 
                 final File newFile = new File(newDir,
                         resourceName.substring(resourceName.lastIndexOf('/') + 1,
-                        resourceName.length()));
+                                resourceName.length()));
 
                 if (!newFile.isDirectory()) {
                     ResourceManager.getResourceManager().

src/com/dmdirc/CustomWindow.java

@@ -68,7 +68,6 @@ public class CustomWindow extends FrameContainer {
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
     }
 
-    /** {@inheritDoc} */
     @Override
     public Connection getConnection() {
         return getParent() == null ? null : getParent().getConnection();

src/com/dmdirc/FrameContainer.java

@@ -528,7 +528,6 @@ public abstract class FrameContainer {
      */
     private class IconChanger implements ConfigChangeListener {
 
-        /** {@inheritDoc} */
         @Override
         public void configChanged(final String domain, final String key) {
             iconUpdated();

src/com/dmdirc/GlobalWindow.java

@@ -68,8 +68,8 @@ public class GlobalWindow extends WritableFrameContainer {
             final URLBuilder urlBuilder) {
         super("icon", "Global", "(Global)", config, parser, messageSinkManager, urlBuilder,
                 Arrays.asList(
-                WindowComponent.TEXTAREA.getIdentifier(),
-                WindowComponent.INPUTFIELD.getIdentifier()));
+                        WindowComponent.TEXTAREA.getIdentifier(),
+                        WindowComponent.INPUTFIELD.getIdentifier()));
 
         tabCompleter = tabCompleterFactory.getTabCompleter(config, CommandType.TYPE_GLOBAL);
     }
@@ -78,19 +78,16 @@ public class GlobalWindow extends WritableFrameContainer {
         return tabCompleter;
     }
 
-    /** {@inheritDoc} */
     @Override
     public Connection getConnection() {
         return null;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void sendLine(final String line) {
         addLine("commandError", "You may only enter commands in the global window.");
     }
 
-    /** {@inheritDoc} */
     @Override
     public int getMaxLineLength() {
         return -1;
@@ -142,7 +139,6 @@ public class GlobalWindow extends WritableFrameContainer {
             this.urlBuilder = urlBuilder;
         }
 
-        /** {@inheritDoc} */
         @Override
         public void configChanged(final String domain, final String key) {
             updateWindowState();

src/com/dmdirc/Main.java

@@ -171,7 +171,7 @@ public class Main {
         globalWindowManager.init();
 
         Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
-            /** {@inheritDoc} */
+
             @Override
             public void run() {
                 eventBus.post(new ClientClosedEvent());
@@ -257,7 +257,7 @@ public class Main {
             }
 
             new Timer().schedule(new TimerTask() {
-                /** {@inheritDoc} */
+
                 @Override
                 public void run() {
                     for (UIController controller : CONTROLLERS) {

src/com/dmdirc/MessageEncoder.java

@@ -51,7 +51,6 @@ public class MessageEncoder implements Encoder {
         this.parser = parser;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String encode(final String source, final String target,
             final byte[] message, final int offset, final int length) {

src/com/dmdirc/Query.java

@@ -114,13 +114,11 @@ public class Query extends MessageTarget implements PrivateActionListener,
         updateTitle();
     }
 
-    /** {@inheritDoc} */
     @Override
     public TabCompleter getTabCompleter() {
         return tabCompleter;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void sendLine(final String line) {
         sendLine(line, getNickname());
@@ -157,7 +155,6 @@ public class Query extends MessageTarget implements PrivateActionListener,
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     protected boolean processNotificationArg(final Object arg, final List<Object> args) {
         if (arg instanceof ClientInfo) {
@@ -171,7 +168,6 @@ public class Query extends MessageTarget implements PrivateActionListener,
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public int getMaxLineLength() {
         return server.getState() == ServerState.CONNECTED ? server.getParser()
@@ -204,7 +200,6 @@ public class Query extends MessageTarget implements PrivateActionListener,
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onPrivateMessage(final Parser parser, final Date date,
             final String message, final String host) {
@@ -219,7 +214,6 @@ public class Query extends MessageTarget implements PrivateActionListener,
         addLine(buff, parts[0], parts[1], parts[2], message);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onPrivateAction(final Parser parser, final Date date,
             final String message, final String host) {
@@ -259,7 +253,6 @@ public class Query extends MessageTarget implements PrivateActionListener,
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onNickChanged(final Parser parser, final Date date,
             final ClientInfo client, final String oldNick) {
@@ -297,7 +290,6 @@ public class Query extends MessageTarget implements PrivateActionListener,
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onQuit(final Parser parser, final Date date,
             final ClientInfo client, final String reason) {
@@ -313,7 +305,6 @@ public class Query extends MessageTarget implements PrivateActionListener,
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onCompositionStateCanged(final Parser parser, final Date date,
             final CompositionState state, final String host) {
@@ -324,13 +315,11 @@ public class Query extends MessageTarget implements PrivateActionListener,
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public Connection getConnection() {
         return server;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void close() {
         super.close();
@@ -368,7 +357,6 @@ public class Query extends MessageTarget implements PrivateActionListener,
         return nickname;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void setCompositionState(final CompositionState state) {
         getConnection().getParser().setCompositionState(host, state);
@@ -380,7 +368,8 @@ public class Query extends MessageTarget implements PrivateActionListener,
         final List<Object> actionArgs = new ArrayList<>();
         actionArgs.add(this);
         actionArgs.addAll(Arrays.asList(args));
-        return ActionManager.getActionManager().triggerEvent(actionType, buffer, actionArgs.toArray());
+        return ActionManager.getActionManager().triggerEvent(actionType, buffer, actionArgs.
+                toArray());
     }
 
 }

src/com/dmdirc/Raw.java

@@ -70,8 +70,8 @@ public class Raw extends WritableFrameContainer
                 messageSinkManager,
                 urlBuilder,
                 Arrays.asList(
-                WindowComponent.TEXTAREA.getIdentifier(),
-                WindowComponent.INPUTFIELD.getIdentifier()));
+                        WindowComponent.TEXTAREA.getIdentifier(),
+                        WindowComponent.INPUTFIELD.getIdentifier()));
 
         this.server = newServer;
 
@@ -90,7 +90,6 @@ public class Raw extends WritableFrameContainer
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void close() {
         super.close();
@@ -104,38 +103,32 @@ public class Raw extends WritableFrameContainer
         server.delRaw();
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onDataIn(final Parser parser, final Date date, final String data) {
         addLine("rawIn", data);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onDataOut(final Parser parser, final Date date, final String data,
             final boolean fromParser) {
         addLine("rawOut", data);
     }
 
-    /** {@inheritDoc} */
     @Override
     public Connection getConnection() {
         return server;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void sendLine(final String line) {
         server.sendLine(line);
     }
 
-    /** {@inheritDoc} */
     @Override
     public int getMaxLineLength() {
         return server.getMaxLineLength();
     }
 
-    /** {@inheritDoc} */
     @Override
     public TabCompleter getTabCompleter() {
         return server.getTabCompleter();

src/com/dmdirc/Server.java

@@ -291,13 +291,11 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void connect() {
         connect(address, profile);
     }
 
-    /** {@inheritDoc} */
     @Override
     @Precondition({
         "The current parser is null or not connected",
@@ -384,7 +382,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
                 CoreActionType.SERVER_CONNECTING, null, this);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void reconnect(final String reason) {
         synchronized (myStateLock) {
@@ -398,19 +395,16 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void reconnect() {
         reconnect(getConfigManager().getOption(DOMAIN_GENERAL, "reconnectmessage"));
     }
 
-    /** {@inheritDoc} */
     @Override
     public void disconnect() {
         disconnect(getConfigManager().getOption(DOMAIN_GENERAL, "quitmessage"));
     }
 
-    /** {@inheritDoc} */
     @Override
     public void disconnect(final String reason) {
         synchronized (myStateLock) {
@@ -503,37 +497,31 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean hasChannel(final String channel) {
         return channels.containsKey(converter.toLowerCase(channel));
     }
 
-    /** {@inheritDoc} */
     @Override
     public Channel getChannel(final String channel) {
         return channels.get(converter.toLowerCase(channel));
     }
 
-    /** {@inheritDoc} */
     @Override
     public List<String> getChannels() {
         return new ArrayList<>(channels.keySet());
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean hasQuery(final String host) {
         return queries.containsKey(converter.toLowerCase(parseHostmask(host)[0]));
     }
 
-    /** {@inheritDoc} */
     @Override
     public Query getQuery(final String host) {
         return getQuery(host, false);
     }
 
-    /** {@inheritDoc} */
     @Override
     public Query getQuery(final String host, final boolean focus) {
         synchronized (myStateLock) {
@@ -560,7 +548,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         return queries.get(lnick);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void updateQuery(final Query query, final String oldNick, final String newNick) {
         tabCompleter.removeEntry(TabCompletionType.QUERY_NICK, oldNick);
@@ -570,20 +557,17 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         queries.remove(converter.toLowerCase(oldNick));
     }
 
-    /** {@inheritDoc} */
     @Override
     public Collection<Query> getQueries() {
         return Collections.unmodifiableCollection(queries.values());
     }
 
-    /** {@inheritDoc} */
     @Override
     public void delQuery(final Query query) {
         tabCompleter.removeEntry(TabCompletionType.QUERY_NICK, query.getNickname());
         queries.remove(converter.toLowerCase(query.getNickname()));
     }
 
-    /** {@inheritDoc} */
     @Override
     public void addRaw() {
         if (raw == null) {
@@ -601,20 +585,17 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void delRaw() {
         raw = null; //NOPMD
     }
 
-    /** {@inheritDoc} */
     @Override
     public void delChannel(final String chan) {
         tabCompleter.removeEntry(TabCompletionType.CHANNEL, chan);
         channels.remove(converter.toLowerCase(chan));
     }
 
-    /** {@inheritDoc} */
     @Override
     public Channel addChannel(final ChannelInfo chan) {
         return addChannel(chan, !backgroundChannels.contains(chan.getName())
@@ -622,7 +603,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
                         "hidechannels"));
     }
 
-    /** {@inheritDoc} */
     @Override
     public Channel addChannel(final ChannelInfo chan, final boolean focus) {
         synchronized (myStateLock) {
@@ -782,7 +762,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         return null;
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean compareURI(final URI uri) {
         if (parser != null) {
@@ -796,7 +775,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         return false;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String[] parseHostmask(final String hostmask) {
         return protocolDescription.parseHostmask(hostmask);
@@ -851,13 +829,11 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void join(final ChannelJoinRequest... requests) {
         join(true, requests);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void join(final boolean focus, final ChannelJoinRequest... requests) {
         synchronized (myStateLock) {
@@ -890,7 +866,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void sendLine(final String line) {
         synchronized (myStateLock) {
@@ -906,7 +881,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public int getMaxLineLength() {
         try {
@@ -917,19 +891,16 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public Parser getParser() {
         return parser;
     }
 
-    /** {@inheritDoc} */
     @Override
     public ConfigProvider getProfile() {
         return profile;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String getChannelPrefixes() {
         try {
@@ -940,7 +911,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public String getAddress() {
         try {
@@ -951,7 +921,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public String getNetwork() {
         try {
@@ -969,7 +938,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean isNetwork(final String target) {
         synchronized (myStateLock) {
@@ -1025,49 +993,41 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public String getIrcd() {
         return parser.getServerSoftwareType();
     }
 
-    /** {@inheritDoc} */
     @Override
     public String getProtocol() {
         return address.getScheme();
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean isAway() {
         return awayMessage != null;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String getAwayMessage() {
         return awayMessage;
     }
 
-    /** {@inheritDoc} */
     @Override
     public TabCompleter getTabCompleter() {
         return tabCompleter;
     }
 
-    /** {@inheritDoc} */
     @Override
     public ServerState getState() {
         return myState.getState();
     }
 
-    /** {@inheritDoc} */
     @Override
     public ServerStatus getStatus() {
         return myState;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void close() {
         super.close();
@@ -1096,7 +1056,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         manager.unregisterServer(this);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void addLineToAll(final String messageType, final Date date,
             final Object... args) {
@@ -1111,7 +1070,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         addLine(messageType, date, args);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void sendCTCPReply(final String source, final String type, final String args) {
         if (type.equalsIgnoreCase("VERSION")) {
@@ -1125,7 +1083,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean isValidChannelName(final String channelName) {
         try {
@@ -1137,13 +1094,11 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public Connection getConnection() {
         return this;
     }
 
-    /** {@inheritDoc} */
     @Override
     protected boolean processNotificationArg(final Object arg, final List<Object> args) {
         if (arg instanceof ClientInfo) {
@@ -1157,7 +1112,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void updateTitle() {
         synchronized (myStateLock) {
@@ -1182,7 +1136,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void configChanged(final String domain, final String key) {
         if ("formatter".equals(domain)) {
@@ -1264,7 +1217,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
             log.info("State lock contended: rerunning on a new thread");
 
             new Thread(new Runnable() {
-                /** {@inheritDoc} */
+
                 @Override
                 public void run() {
                     onSocketClosed();
@@ -1509,38 +1462,32 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public IgnoreList getIgnoreList() {
         return ignoreList;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void updateIgnoreList() {
         ignoreList.clear();
         ignoreList.addAll(getConfigManager().getOptionList("network", "ignorelist"));
     }
 
-    /** {@inheritDoc} */
     @Override
     public void saveIgnoreList() {
         getNetworkIdentity().setOption("network", "ignorelist", ignoreList.getRegexList());
     }
 
-    /** {@inheritDoc} */
     @Override
     public ConfigProvider getServerIdentity() {
         return identityFactory.createServerConfig(parser.getServerName());
     }
 
-    /** {@inheritDoc} */
     @Override
     public ConfigProvider getNetworkIdentity() {
         return identityFactory.createNetworkConfig(getNetwork());
     }
 
-    /** {@inheritDoc} */
     @Override
     public void addInviteListener(final InviteListener listener) {
         synchronized (listeners) {
@@ -1548,7 +1495,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void removeInviteListener(final InviteListener listener) {
         synchronized (listeners) {
@@ -1556,7 +1502,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void addInvite(final Invite invite) {
         synchronized (invites) {
@@ -1576,7 +1521,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void acceptInvites(final Invite... invites) {
         final ChannelJoinRequest[] requests = new ChannelJoinRequest[invites.length];
@@ -1588,7 +1532,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         join(requests);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void acceptInvites() {
         synchronized (invites) {
@@ -1596,7 +1539,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void removeInvites(final String channel) {
         for (Invite invite : new ArrayList<>(invites)) {
@@ -1606,7 +1548,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void removeInvites() {
         for (Invite invite : new ArrayList<>(invites)) {
@@ -1614,7 +1555,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void removeInvite(final Invite invite) {
         synchronized (invites) {
@@ -1628,13 +1568,11 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public List<Invite> getInvites() {
         return invites;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void addAwayStateListener(final AwayStateListener listener) {
         synchronized (listeners) {
@@ -1642,7 +1580,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void removeAwayStateListener(final AwayStateListener listener) {
         synchronized (listeners) {
@@ -1650,7 +1587,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void updateAwayState(final String message) {
         if ((awayMessage != null && awayMessage.equals(message))
@@ -1661,7 +1597,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         awayMessage = message;
 
         new Thread(new Runnable() {
-            /** {@inheritDoc} */
+
             @Override
             public void run() {
                 synchronized (listeners) {
@@ -1679,7 +1615,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }, "Away state listener runner").start();
     }
 
-    /** {@inheritDoc} */
     @Override
     public void addCertificateProblemListener(final CertificateProblemListener listener) {
         listeners.add(CertificateProblemListener.class, listener);
@@ -1690,13 +1625,11 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void removeCertificateProblemListener(final CertificateProblemListener listener) {
         listeners.remove(CertificateProblemListener.class, listener);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void certificateProblemEncountered(final X509Certificate[] chain,
             final Collection<CertificateException> problems,
@@ -1706,7 +1639,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void certificateProblemResolved(final CertificateManager manager) {
         for (CertificateProblemListener listener : listeners.get(CertificateProblemListener.class)) {

src/com/dmdirc/ServerEventHandler.java

@@ -103,7 +103,6 @@ public class ServerEventHandler extends EventHandler implements
         this.owner = owner;
     }
 
-    /** {@inheritDoc} */
     @Override
     @SuppressWarnings("unchecked")
     protected <T extends CallbackInterface> void addCallback(
@@ -111,20 +110,17 @@ public class ServerEventHandler extends EventHandler implements
         cbm.addCallback(type, (T) this);
     }
 
-    /** {@inheritDoc} */
     @Override
     protected Connection getConnection() {
         return owner;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onChannelSelfJoin(final Parser parser, final Date date, final ChannelInfo channel) {
         checkParser(parser);
         owner.addChannel(channel);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onPrivateMessage(final Parser parser, final Date date, final String message,
             final String host) {
@@ -135,7 +131,6 @@ public class ServerEventHandler extends EventHandler implements
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onPrivateAction(final Parser parser, final Date date, final String message,
             final String host) {
@@ -146,7 +141,6 @@ public class ServerEventHandler extends EventHandler implements
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onErrorInfo(final Parser parser, final Date date, final ParserError errorInfo) {
         final ErrorLevel errorLevel = ErrorLevel.UNKNOWN;
@@ -175,7 +169,6 @@ public class ServerEventHandler extends EventHandler implements
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onPrivateCTCP(final Parser parser, final Date date, final String type,
             final String message, final String host) {
@@ -189,7 +182,6 @@ public class ServerEventHandler extends EventHandler implements
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onPrivateCTCPReply(final Parser parser, final Date date, final String type,
             final String message, final String host) {
@@ -201,7 +193,6 @@ public class ServerEventHandler extends EventHandler implements
                 host), type, message);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onSocketClosed(final Parser parser, final Date date) {
         if (owner.getParser() == parser) {
@@ -209,7 +200,6 @@ public class ServerEventHandler extends EventHandler implements
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onPrivateNotice(final Parser parser, final Date date,
             final String message, final String host) {
@@ -221,7 +211,6 @@ public class ServerEventHandler extends EventHandler implements
                 host), message);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onServerNotice(final Parser parser, final Date date,
             final String message, final String host) {
@@ -233,7 +222,6 @@ public class ServerEventHandler extends EventHandler implements
                 getClient(host), message);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onMOTDStart(final Parser parser, final Date date, final String data) {
         checkParser(parser);
@@ -242,7 +230,6 @@ public class ServerEventHandler extends EventHandler implements
         triggerAction("motdStart", CoreActionType.SERVER_MOTDSTART, data);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onMOTDLine(final Parser parser, final Date date, final String data) {
         checkParser(parser);
@@ -251,7 +238,6 @@ public class ServerEventHandler extends EventHandler implements
         triggerAction("motdLine", CoreActionType.SERVER_MOTDLINE, data);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onMOTDEnd(final Parser parser, final Date date,
             final boolean noMOTD, final String data) {
@@ -261,7 +247,6 @@ public class ServerEventHandler extends EventHandler implements
         triggerAction("motdEnd", CoreActionType.SERVER_MOTDEND, data);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onNumeric(final Parser parser, final Date date, final int numeric,
             final String[] token) {
@@ -269,14 +254,12 @@ public class ServerEventHandler extends EventHandler implements
         owner.onNumeric(numeric, token);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onPingFailed(final Parser parser, final Date date) {
         checkParser(parser);
         owner.onPingFailed();
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onPingSent(final Parser parser, final Date date) {
         checkParser(parser);
@@ -285,7 +268,6 @@ public class ServerEventHandler extends EventHandler implements
                 CoreActionType.SERVER_PINGSENT, null, owner);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onPingSuccess(final Parser parser, final Date date) {
         checkParser(parser);
@@ -295,7 +277,6 @@ public class ServerEventHandler extends EventHandler implements
                 Long.valueOf(owner.getParser().getServerLatency()));
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onAwayState(final Parser parser, final Date date, final AwayState oldState,
             final AwayState currentState, final String reason) {
@@ -317,28 +298,24 @@ public class ServerEventHandler extends EventHandler implements
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onConnectError(final Parser parser, final Date date, final ParserError errorInfo) {
         checkParser(parser);
         owner.onConnectError(errorInfo);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onNickInUse(final Parser parser, final Date date, final String nickname) {
         owner.onNickInUse(nickname);
         checkParser(parser);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onServerReady(final Parser parser, final Date date) {
         checkParser(parser);
         owner.onPost005();
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onNoticeAuth(final Parser parser, final Date date, final String data) {
         checkParser(parser);
@@ -347,7 +324,6 @@ public class ServerEventHandler extends EventHandler implements
         triggerAction("authNotice", CoreActionType.SERVER_AUTHNOTICE, data);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onUnknownNotice(final Parser parser, final Date date, final String message,
             final String target, final String host) {
@@ -358,7 +334,6 @@ public class ServerEventHandler extends EventHandler implements
         triggerAction("unknownNotice", CoreActionType.SERVER_UNKNOWNNOTICE, host, target, message);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onUnknownMessage(final Parser parser, final Date date, final String message,
             final String target, final String host) {
@@ -378,7 +353,6 @@ public class ServerEventHandler extends EventHandler implements
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onUnknownAction(final Parser parser, final Date date, final String message,
             final String target, final String host) {
@@ -397,7 +371,6 @@ public class ServerEventHandler extends EventHandler implements
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onUserModeChanged(final Parser parser, final Date date,
             final ClientInfo client, final String host, final String modes) {
@@ -409,7 +382,6 @@ public class ServerEventHandler extends EventHandler implements
                 getClient(host), modes);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onUserModeDiscovered(final Parser parser, final Date date,
             final ClientInfo client, final String modes) {
@@ -422,7 +394,6 @@ public class ServerEventHandler extends EventHandler implements
                 CoreActionType.SERVER_USERMODES, client, modes);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onInvite(final Parser parser, final Date date, final String userHost,
             final String channel) {
@@ -436,7 +407,6 @@ public class ServerEventHandler extends EventHandler implements
                 getClient(userHost), channel);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onWallop(final Parser parser, final Date date, final String message,
             final String host) {
@@ -449,7 +419,6 @@ public class ServerEventHandler extends EventHandler implements
 
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onWalluser(final Parser parser, final Date date, final String message,
             final String host) {
@@ -461,7 +430,6 @@ public class ServerEventHandler extends EventHandler implements
                 message);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onWallDesync(final Parser parser, final Date date, final String message,
             final String host) {
@@ -473,7 +441,6 @@ public class ServerEventHandler extends EventHandler implements
                 host), message);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onNickChanged(final Parser parser, final Date date, final ClientInfo client,
             final String oldNick) {
@@ -488,7 +455,6 @@ public class ServerEventHandler extends EventHandler implements
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onServerError(final Parser parser, final Date date, final String message) {
         checkParser(parser);
@@ -497,7 +463,6 @@ public class ServerEventHandler extends EventHandler implements
         triggerAction("serverError", CoreActionType.SERVER_ERROR, message);
     }
 
-    /** {@inheritDoc} */
     @Override
     protected void checkParser(final Parser parser) {
         super.checkParser(parser);
@@ -518,7 +483,8 @@ public class ServerEventHandler extends EventHandler implements
         final List<Object> actionArgs = new ArrayList<>();
         actionArgs.add(owner);
         actionArgs.addAll(Arrays.asList(args));
-        return ActionManager.getActionManager().triggerEvent(actionType, buffer, actionArgs.toArray());
+        return ActionManager.getActionManager().triggerEvent(actionType, buffer, actionArgs.
+                toArray());
     }
 
 }

src/com/dmdirc/ServerManager.java

@@ -90,11 +90,10 @@ public class ServerManager implements ServerFactory {
         this.serverFactoryImpl = serverFactory;
     }
 
-    /** {@inheritDoc} */
     @Override
     public Server createServer(final URI uri, final ConfigProvider profile) {
-        final ConfigProviderMigrator configProvider =
-                identityFactory.createMigratableConfig(uri.getScheme(), "", "", uri.getHost());
+        final ConfigProviderMigrator configProvider = identityFactory.createMigratableConfig(uri.
+                getScheme(), "", "", uri.getHost());
 
         final Server server = serverFactoryImpl.getServer(
                 configProvider,

src/com/dmdirc/ServerState.java

@@ -32,42 +32,41 @@ public enum ServerState {
 
     /** Indicates the client is in the process of connecting. */
     CONNECTING(
-    "CONNECTED", // Connection attempt succeeded
-    "TRANSIENTLY_DISCONNECTED", // Connection attempt failed
-    "DISCONNECTING", // User ordered a disconnection
-    "CLOSING" // DMDirc is closing
+            "CONNECTED", // Connection attempt succeeded
+            "TRANSIENTLY_DISCONNECTED", // Connection attempt failed
+            "DISCONNECTING", // User ordered a disconnection
+            "CLOSING" // DMDirc is closing
     ),
     /** Indicates the client has connected to the server. */
     CONNECTED(
-    "DISCONNECTING", // User ordered a disconnection
-    "TRANSIENTLY_DISCONNECTED", // Server caused a disconnection
-    "CLOSING" // DMDirc is closing
+            "DISCONNECTING", // User ordered a disconnection
+            "TRANSIENTLY_DISCONNECTED", // Server caused a disconnection
+            "CLOSING" // DMDirc is closing
     ),
     /** Indicates that we've been temporarily disconnected. */
     TRANSIENTLY_DISCONNECTED(
-    "CONNECTING", // User forced a connect attempt
-    "RECONNECT_WAIT", // Waiting for auto-reconnect
-    "CLOSING" // DMDirc is closing
+            "CONNECTING", // User forced a connect attempt
+            "RECONNECT_WAIT", // Waiting for auto-reconnect
+            "CLOSING" // DMDirc is closing
     ),
     /** Indicates that the user has told us to disconnect. */
     DISCONNECTED(
-    "CONNECTING", // User forced a connect attempt
-    "CLOSING" // DMDirc is closing
+            "CONNECTING", // User forced a connect attempt
+            "CLOSING" // DMDirc is closing
     ),
     /** In the process of disconnecting. */
     DISCONNECTING(
-    "DISCONNECTED", // Socket closed
-    "CLOSING" // DMDirc is closing
+            "DISCONNECTED", // Socket closed
+            "CLOSING" // DMDirc is closing
     ),
     /** Indicates we're waiting for the auto-reconnect timer to fire. */
     RECONNECT_WAIT(
-    "CONNECTING", // User forced a connect attempt
-    "TRANSIENTLY_DISCONNECTED", // Reconnect timer expired
-    "DISCONNECTED", // User forced a disconnect
-    "CLOSING" // DMDirc is closing
+            "CONNECTING", // User forced a connect attempt
+            "TRANSIENTLY_DISCONNECTED", // Reconnect timer expired
+            "DISCONNECTED", // User forced a disconnect
+            "CLOSING" // DMDirc is closing
     ),
-    /** Indicates that the server frame and its
-     * children are closing. */
+    /** Indicates that the server frame and its children are closing. */
     CLOSING;
     /** The allowed transitions from this state. */
     private final List<String> transitions;

src/com/dmdirc/SystemLifecycleController.java

@@ -46,25 +46,21 @@ public class SystemLifecycleController implements LifecycleController {
         this.serverManager = serverManager;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void quit() {
         quit(0);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void quit(final int exitCode) {
         quit(configProvider.getOption("general", "closemessage"), exitCode);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void quit(final String reason) {
         quit(reason, 0);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void quit(final String reason, final int exitCode) {
         serverManager.disconnectAll(reason);

src/com/dmdirc/Topic.java

@@ -74,7 +74,6 @@ public class Topic {
         return topic;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String toString() {
         return topic;

src/com/dmdirc/actions/Action.java

@@ -332,7 +332,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
             if (trigger == null) {
                 Logger.appError(ErrorLevel.LOW, "ActionType was null",
                         new IllegalArgumentException("Triggers: "
-                        + Arrays.toString(triggers)));
+                                + Arrays.toString(triggers)));
                 continue;
             }
 
@@ -419,7 +419,6 @@ public class Action extends ActionModel implements ConfigChangeListener {
         String starget = null;
 
         // ------ Read the argument
-
         try {
             arg = Integer.parseInt(data.get("argument"));
         } catch (NumberFormatException ex) {
@@ -434,7 +433,6 @@ public class Action extends ActionModel implements ConfigChangeListener {
         }
 
         // ------ Read the component or the source
-
         if (arg == -1) {
             starget = data.get("starget");
 
@@ -450,7 +448,6 @@ public class Action extends ActionModel implements ConfigChangeListener {
         }
 
         // ------ Read the comparison
-
         comparison = actionController.getComparison(data.get("comparison"));
         if (comparison == null) {
             error(ActionErrorType.CONDITIONS, "Invalid comparison specified: "
@@ -466,7 +463,6 @@ public class Action extends ActionModel implements ConfigChangeListener {
         }
 
         // ------ Read the target
-
         target = data.get("target");
 
         if (target == null) {
@@ -536,7 +532,6 @@ public class Action extends ActionModel implements ConfigChangeListener {
                 + group + "/" + name + ": " + message);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void setName(final String newName) {
         super.setName(newName);
@@ -547,7 +542,6 @@ public class Action extends ActionModel implements ConfigChangeListener {
         save();
     }
 
-    /** {@inheritDoc} */
     @Override
     public void setGroup(final String newGroup) {
         super.setGroup(newGroup);
@@ -570,7 +564,6 @@ public class Action extends ActionModel implements ConfigChangeListener {
         new File(location).delete();
     }
 
-    /** {@inheritDoc} */
     @Override
     public String toString() {
         final String parent = super.toString();
@@ -579,7 +572,6 @@ public class Action extends ActionModel implements ConfigChangeListener {
                 + ",location=" + location + "]";
     }
 
-    /** {@inheritDoc} */
     @Override
     public void configChanged(final String domain, final String key) {
         checkDisabled();
@@ -592,8 +584,8 @@ public class Action extends ActionModel implements ConfigChangeListener {
      */
     protected void checkDisabled() {
         final String key = (group + "/" + name).replace(' ', '.');
-        final boolean disabled =
-                identityController.getGlobalConfiguration().hasOptionBool("disable_action", key)
+        final boolean disabled = identityController.getGlobalConfiguration().hasOptionBool(
+                "disable_action", key)
                 && identityController.getGlobalConfiguration().getOptionBool("disable_action", key);
 
         if (disabled && status == ActionStatus.ACTIVE) {

src/com/dmdirc/actions/ActionComponentChain.java

@@ -69,7 +69,6 @@ public class ActionComponentChain implements ActionComponent {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public Object get(final Object arg) {
         Object res = arg;
@@ -85,7 +84,6 @@ public class ActionComponentChain implements ActionComponent {
         return res;
     }
 
-    /** {@inheritDoc} */
     @Precondition("This component chain has one or more components")
     @Override
     public Class<?> appliesTo() {
@@ -94,7 +92,6 @@ public class ActionComponentChain implements ActionComponent {
         return components.get(0).appliesTo();
     }
 
-    /** {@inheritDoc} */
     @Precondition("This component chain has one or more components")
     @Override
     public Class<?> getType() {
@@ -103,7 +100,6 @@ public class ActionComponentChain implements ActionComponent {
         return components.get(components.size() - 1).getType();
     }
 
-    /** {@inheritDoc} */
     @Precondition("This component chain has one or more components")
     @Override
     public String getName() {
@@ -119,7 +115,6 @@ public class ActionComponentChain implements ActionComponent {
         return name.substring(3);
     }
 
-    /** {@inheritDoc} */
     @Override
     @Precondition("This component chain has one or more components")
     public String toString() {
@@ -135,7 +130,6 @@ public class ActionComponentChain implements ActionComponent {
         return name.substring(1);
     }
 
-    /** {@inheritDoc} */
     @Override
     public String name() {
         return toString();

src/com/dmdirc/actions/ActionCondition.java

@@ -186,14 +186,12 @@ public class ActionCondition {
         this.starget = starget;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String toString() {
         return "[ arg=" + arg + ", component=" + component + ", comparison="
                 + comparison + ", target=" + target + ", starget=" + starget + " ]";
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean equals(final Object obj) {
         if (!(obj instanceof ActionCondition)) {
@@ -207,7 +205,6 @@ public class ActionCondition {
                 && starget.equals(o.getStarget());
     }
 
-    /** {@inheritDoc} */
     @Override
     public int hashCode() {
         return arg + 100 * (arg == -1 ? starget.hashCode() : component.hashCode())

src/com/dmdirc/actions/ActionGroup.java

@@ -175,7 +175,6 @@ public class ActionGroup implements Iterable<Action> {
         actions.remove(action);
     }
 
-    /** {@inheritDoc} */
     @Override
     public Iterator<Action> iterator() {
         return actions.iterator();

src/com/dmdirc/actions/ActionManager.java

@@ -186,7 +186,6 @@ public class ActionManager implements ActionController {
         eventBus.register(this);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void saveAllActions() {
         for (ActionGroup group : groups.values()) {
@@ -207,20 +206,17 @@ public class ActionManager implements ActionController {
         saveAllActions();
     }
 
-    /** {@inheritDoc} */
     @Override
     public void registerSetting(final String name, final String value) {
         LOG.debug("Registering new action setting: {} = {}", name, value);
         identityManager.getAddonSettings().setOption("actions", name, value);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void addGroup(final ActionGroup group) {
         groups.put(group.getName(), group);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void registerTypes(final ActionType[] newTypes) {
         for (ActionType type : newTypes) {
@@ -234,7 +230,6 @@ public class ActionManager implements ActionController {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void registerComponents(final ActionComponent[] comps) {
         for (ActionComponent comp : comps) {
@@ -245,7 +240,6 @@ public class ActionManager implements ActionController {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void registerComparisons(final ActionComparison[] comps) {
         for (ActionComparison comp : comps) {
@@ -256,19 +250,16 @@ public class ActionManager implements ActionController {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public Map<String, ActionGroup> getGroupsMap() {
         return Collections.unmodifiableMap(groups);
     }
 
-    /** {@inheritDoc} */
     @Override
     public MapList<String, ActionType> getGroupedTypes() {
         return new MapList<>(typeGroups);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void loadUserActions() {
         actions.clear();
@@ -336,7 +327,6 @@ public class ActionManager implements ActionController {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void addAction(final Action action) {
         checkNotNull(action);
@@ -354,7 +344,6 @@ public class ActionManager implements ActionController {
         getOrCreateGroup(action.getGroup()).add(action);
     }
 
-    /** {@inheritDoc} */
     @Override
     public ActionGroup getOrCreateGroup(final String name) {
         if (!groups.containsKey(name)) {
@@ -364,7 +353,6 @@ public class ActionManager implements ActionController {
         return groups.get(name);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void removeAction(final Action action) {
         checkNotNull(action);
@@ -373,14 +361,12 @@ public class ActionManager implements ActionController {
         getOrCreateGroup(action.getGroup()).remove(action);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void reregisterAction(final Action action) {
         removeAction(action);
         addAction(action);
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean triggerEvent(final ActionType type,
             final StringBuffer format, final Object... arguments) {
@@ -535,7 +521,6 @@ public class ActionManager implements ActionController {
         return arguments;
     }
 
-    /** {@inheritDoc} */
     @Override
     public ActionGroup createGroup(final String group) {
         checkNotNull(group);
@@ -553,7 +538,6 @@ public class ActionManager implements ActionController {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void deleteGroup(final String group) {
         checkNotNull(group);
@@ -585,7 +569,6 @@ public class ActionManager implements ActionController {
         groups.remove(group);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void changeGroupName(final String oldName, final String newName) {
         checkNotNull(oldName);
@@ -607,7 +590,6 @@ public class ActionManager implements ActionController {
         deleteGroup(oldName);
     }
 
-    /** {@inheritDoc} */
     @Override
     public ActionType getType(final String type) {
         if (type == null || type.isEmpty()) {
@@ -623,7 +605,6 @@ public class ActionManager implements ActionController {
         return null;
     }
 
-    /** {@inheritDoc} */
     @Override
     public List<ActionType> findCompatibleTypes(final ActionType type) {
         checkNotNull(type);
@@ -638,7 +619,6 @@ public class ActionManager implements ActionController {
         return res;
     }
 
-    /** {@inheritDoc} */
     @Override
     public List<ActionComponent> findCompatibleComponents(final Class<?> target) {
         checkNotNull(target);
@@ -653,7 +633,6 @@ public class ActionManager implements ActionController {
         return res;
     }
 
-    /** {@inheritDoc} */
     @Override
     public List<ActionComparison> findCompatibleComparisons(final Class<?> target) {
         checkNotNull(target);
@@ -668,7 +647,6 @@ public class ActionManager implements ActionController {
         return res;
     }
 
-    /** {@inheritDoc} */
     @Override
     public ActionComponent getComponent(final String type) {
         checkNotNull(type);
@@ -683,7 +661,6 @@ public class ActionManager implements ActionController {
         return null;
     }
 
-    /** {@inheritDoc} */
     @Override
     public ActionComparison getComparison(final String type) {
         checkNotNull(type);
@@ -715,7 +692,6 @@ public class ActionManager implements ActionController {
         new File(path).delete();
     }
 
-    /** {@inheritDoc} */
     @Override
     public void registerListener(final ActionListener listener, final ActionType... types) {
         for (ActionType type : types) {
@@ -723,7 +699,6 @@ public class ActionManager implements ActionController {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void unregisterListener(final ActionListener listener, final ActionType... types) {
         for (ActionType type : types) {
@@ -731,7 +706,6 @@ public class ActionManager implements ActionController {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void unregisterListener(final ActionListener listener) {
         listeners.removeFromAll(listener);

src/com/dmdirc/actions/ActionModel.java

@@ -440,7 +440,6 @@ public class ActionModel {
         this.modified = false;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String toString() {
         return "[name=" + group + "/" + name + ", triggers="

src/com/dmdirc/actions/ActionSubstitutor.java

@@ -70,8 +70,7 @@ public class ActionSubstitutor {
     /** Pattern to determine if a substitution is a word number type. */
     private static final Pattern NUMBER_PATTERN = Pattern.compile("([0-9]+)(-([0-9]+)?)?");
     /** Pattern to determine if a substitution is an argument+component type. */
-    private static final Pattern COMP_PATTERN =
-            Pattern.compile("([0-9]+)\\.([A-Z_]+(\\.[A-Z_]+)*)");
+    private static final Pattern COMP_PATTERN = Pattern.compile("([0-9]+)\\.([A-Z_]+(\\.[A-Z_]+)*)");
     /** Pattern to determine if a substitution is a server component type. */
     private static final Pattern SERVER_PATTERN = Pattern.compile("[A-Z_]+(\\.[A-Z_]+)*");
     /** The action controller to use to find components. */

src/com/dmdirc/actions/ActionTypeComparator.java

@@ -39,7 +39,6 @@ public final class ActionTypeComparator implements Comparator<ActionType>, Seria
      */
     private static final long serialVersionUID = 1;
 
-    /** {@inheritDoc} */
     @Override
     public int compare(final ActionType o1, final ActionType o2) {
         return o1.getName().compareTo(o2.getName());

src/com/dmdirc/actions/ColourActionComparison.java

@@ -65,26 +65,22 @@ public class ColourActionComparison {
     /** Checks if the colour is the same as another colour. */
     private class Equals implements ActionComparison {
 
-        /** {@inheritDoc} */
         @Override
         public boolean test(final Object arg1, final Object arg2) {
             return ((Colour) arg1).equals(colourManager.get().getColourFromString((String) arg2,
                     null));
         }
 
-        /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() {
             return Colour.class;
         }
 
-        /** {@inheritDoc} */
         @Override
         public String getName() {
             return "equals";
         }
 
-        /** {@inheritDoc} */
         @Override
         public String name() {
             return "COLOUR_EQUALS";
@@ -95,25 +91,21 @@ public class ColourActionComparison {
     /** Checks if the colour is not the same as another colour. */
     private class NotEquals implements ActionComparison {
 
-        /** {@inheritDoc} */
         @Override
         public boolean test(final Object arg1, final Object arg2) {
             return !equalsComparison.test(arg1, arg2);
         }
 
-        /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() {
             return Colour.class;
         }
 
-        /** {@inheritDoc} */
         @Override
         public String getName() {
             return "does not equal";
         }
 
-        /** {@inheritDoc} */
         @Override
         public String name() {
             return "COLOUR_NEQUALS";

src/com/dmdirc/actions/ConditionTree.java

@@ -135,14 +135,12 @@ public final class ConditionTree {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean equals(final Object obj) {
         return obj instanceof ConditionTree
                 && toString().equals(((ConditionTree) obj).toString());
     }
 
-    /** {@inheritDoc} */
     @Override
     public int hashCode() {
         return toString().hashCode();

src/com/dmdirc/actions/ConditionTreeFactory.java

@@ -83,13 +83,11 @@ public abstract class ConditionTreeFactory {
      */
     public static class ConjunctionFactory extends ConditionTreeFactory {
 
-        /** {@inheritDoc} */
         @Override
         public ConditionTree getConditionTree(final int args) {
             return ConditionTree.createConjunction(args);
         }
 
-        /** {@inheritDoc} */
         @Override
         public ConditionTreeFactoryType getType() {
             return ConditionTreeFactoryType.CONJUNCTION;
@@ -102,13 +100,11 @@ public abstract class ConditionTreeFactory {
      */
     public static class DisjunctionFactory extends ConditionTreeFactory {
 
-        /** {@inheritDoc} */
         @Override
         public ConditionTree getConditionTree(final int args) {
             return ConditionTree.createDisjunction(args);
         }
 
-        /** {@inheritDoc} */
         @Override
         public ConditionTreeFactoryType getType() {
             return ConditionTreeFactoryType.DISJUNCTION;
@@ -133,13 +129,11 @@ public abstract class ConditionTreeFactory {
             this.tree = tree;
         }
 
-        /** {@inheritDoc} */
         @Override
         public ConditionTree getConditionTree(final int args) {
             return tree;
         }
 
-        /** {@inheritDoc} */
         @Override
         public ConditionTreeFactoryType getType() {
             return ConditionTreeFactoryType.CUSTOM;

src/com/dmdirc/actions/CoreActionComparison.java

@@ -34,220 +34,201 @@ public enum CoreActionComparison implements ActionComparison {
 
     /** Compares a string to another using a regular expression. */
     STRING_REGEX {
-        /** {@inheritDoc} */
-        @Override
-        public boolean test(final Object arg1, final Object arg2) {
-            try {
-                return ((String) arg1).matches((String) arg2);
-            } catch (PatternSyntaxException pse) {
-                return false;
-            }
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public Class<?> appliesTo() {
-            return String.class;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public String getName() {
-            return "matches regex";
-        }
-    },
+
+                @Override
+                public boolean test(final Object arg1, final Object arg2) {
+                    try {
+                        return ((String) arg1).matches((String) arg2);
+                    } catch (PatternSyntaxException pse) {
+                        return false;
+                    }
+                }
+
+                @Override
+                public Class<?> appliesTo() {
+                    return String.class;
+                }
+
+                @Override
+                public String getName() {
+                    return "matches regex";
+                }
+            },
     /** Compares if two strings content are
      * the same, case insensitive. */
     STRING_EQUALS {
-        /** {@inheritDoc} */
-        @Override
-        public boolean test(final Object arg1, final Object arg2) {
-            return ((String) arg1).equalsIgnoreCase((String) arg2);
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public Class<?> appliesTo() {
-            return String.class;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public String getName() {
-            return "equals";
-        }
-    },
-    /** Compares if two strings content aren't the same, case insensitive. */
+
+                @Override
+                public boolean test(final Object arg1, final Object arg2) {
+                    return ((String) arg1).equalsIgnoreCase((String) arg2);
+                }
+
+                @Override
+                public Class<?> appliesTo() {
+                    return String.class;
+                }
+
+                @Override
+                public String getName() {
+                    return "equals";
+                }
+            },
+    /** Compares if two strings content aren't the same, case
+     * insensitive. */
     STRING_NEQUALS {
-        /** {@inheritDoc} */
-        @Override
-        public boolean test(final Object arg1, final Object arg2) {
-            return !STRING_EQUALS.test(arg1, arg2);
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public Class<?> appliesTo() {
-            return String.class;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public String getName() {
-            return "does not equal";
-        }
-    },
+
+                @Override
+                public boolean test(final Object arg1, final Object arg2) {
+                    return !STRING_EQUALS.test(arg1, arg2);
+                }
+
+                @Override
+                public Class<?> appliesTo() {
+                    return String.class;
+                }
+
+                @Override
+                public String getName() {
+                    return "does not equal";
+                }
+            },
     /** Checks if the string starts with another strings. */
     STRING_STARTSWITH {
-        /** {@inheritDoc} */
-        @Override
-        public boolean test(final Object arg1, final Object arg2) {
-            return ((String) arg1).startsWith((String) arg2);
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public Class<?> appliesTo() {
-            return String.class;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public String getName() {
-            return "starts with";
-        }
-    },
+
+                @Override
+                public boolean test(final Object arg1, final Object arg2) {
+                    return ((String) arg1).startsWith((String) arg2);
+                }
+
+                @Override
+                public Class<?> appliesTo() {
+                    return String.class;
+                }
+
+                @Override
+                public String getName() {
+                    return "starts with";
+                }
+            },
     /** Checks if the string containts another string. */
     STRING_CONTAINS {
-        /** {@inheritDoc} */
-        @Override
-        public boolean test(final Object arg1, final Object arg2) {
-            return ((String) arg1).indexOf((String) arg2) != -1;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public Class<?> appliesTo() {
-            return String.class;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public String getName() {
-            return "contains";
-        }
-    },
+
+                @Override
+                public boolean test(final Object arg1, final Object arg2) {
+                    return ((String) arg1).indexOf((String) arg2) != -1;
+                }
+
+                @Override
+                public Class<?> appliesTo() {
+                    return String.class;
+                }
+
+                @Override
+                public String getName() {
+                    return "contains";
+                }
+            },
     /** Checks if the string doesn't containt another string. */
     STRING_NCONTAINS {
-        /** {@inheritDoc} */
-        @Override
-        public boolean test(final Object arg1, final Object arg2) {
-            return ((String) arg1).indexOf((String) arg2) == -1;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public Class<?> appliesTo() {
-            return String.class;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public String getName() {
-            return "doesn't contain";
-        }
-    },
+
+                @Override
+                public boolean test(final Object arg1, final Object arg2) {
+                    return ((String) arg1).indexOf((String) arg2) == -1;
+                }
+
+                @Override
+                public Class<?> appliesTo() {
+                    return String.class;
+                }
+
+                @Override
+                public String getName() {
+                    return "doesn't contain";
+                }
+            },
     /** Checks if two boolean values are equal. */
     BOOL_IS {
-        /** {@inheritDoc} */
-        @Override
-        public boolean test(final Object arg1, final Object arg2) {
-            return ((Boolean) arg1).equals(Boolean.valueOf((String) arg2));
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public Class<?> appliesTo() {
-            return Boolean.class;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public String getName() {
-            return "is";
-        }
-    },
+
+                @Override
+                public boolean test(final Object arg1, final Object arg2) {
+                    return ((Boolean) arg1).equals(Boolean.valueOf((String) arg2));
+                }
+
+                @Override
+                public Class<?> appliesTo() {
+                    return Boolean.class;
+                }
+
+                @Override
+                public String getName() {
+                    return "is";
+                }
+            },
     /** Checks if the int is equals to another int. */
     INT_EQUALS {
-        /** {@inheritDoc} */
-        @Override
-        public boolean test(final Object arg1, final Object arg2) {
-            try {
-                return 0 == ((Integer) arg1).compareTo(Integer.parseInt((String) arg2));
-            } catch (NumberFormatException ex) {
-                return false;
-            }
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public Class<?> appliesTo() {
-            return Integer.class;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public String getName() {
-            return "equals";
-        }
-    },
+
+                @Override
+                public boolean test(final Object arg1, final Object arg2) {
+                    try {
+                        return 0 == ((Integer) arg1).compareTo(Integer.parseInt((String) arg2));
+                    } catch (NumberFormatException ex) {
+                        return false;
+                    }
+                }
+
+                @Override
+                public Class<?> appliesTo() {
+                    return Integer.class;
+                }
+
+                @Override
+                public String getName() {
+                    return "equals";
+                }
+            },
     /** Checks if the int is larger than another int. */
     INT_GREATER {
-        /** {@inheritDoc} */
-        @Override
-        public boolean test(final Object arg1, final Object arg2) {
-            try {
-                return 0 < ((Integer) arg1).compareTo(Integer.parseInt((String) arg2));
-            } catch (NumberFormatException ex) {
-                return false;
-            }
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public Class<?> appliesTo() {
-            return Integer.class;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public String getName() {
-            return "is greater than";
-        }
-    },
+
+                @Override
+                public boolean test(final Object arg1, final Object arg2) {
+                    try {
+                        return 0 < ((Integer) arg1).compareTo(Integer.parseInt((String) arg2));
+                    } catch (NumberFormatException ex) {
+                        return false;
+                    }
+                }
+
+                @Override
+                public Class<?> appliesTo() {
+                    return Integer.class;
+                }
+
+                @Override
+                public String getName() {
+                    return "is greater than";
+                }
+            },
     /** Checks if the int is smaller than another int. */
     INT_LESS {
-        /** {@inheritDoc} */
-        @Override
-        public boolean test(final Object arg1, final Object arg2) {
-            try {
-                return 0 > ((Integer) arg1).compareTo(Integer.parseInt((String) arg2));
-            } catch (NumberFormatException ex) {
-                return false;
-            }
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public Class<?> appliesTo() {
-            return Integer.class;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public String getName() {
-            return "is less than";
-        }
-    };
+
+                @Override
+                public boolean test(final Object arg1, final Object arg2) {
+                    try {
+                        return 0 > ((Integer) arg1).compareTo(Integer.parseInt((String) arg2));
+                    } catch (NumberFormatException ex) {
+                        return false;
+                    }
+                }
+
+                @Override
+                public Class<?> appliesTo() {
+                    return Integer.class;
+                }
+
+                @Override
+                public String getName() {
+                    return "is less than";
+                }
+            };
 
 }

src/com/dmdirc/actions/CoreActionType.java

@@ -246,13 +246,11 @@ public enum CoreActionType implements ActionType {
         this.name = name;
     }
 
-    /** {@inheritDoc} */
     @Override
     public ActionMetaType getType() {
         return type;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String getName() {
         return name;

src/com/dmdirc/actions/internal/WhoisNumericFormatter.java

@@ -63,7 +63,6 @@ public class WhoisNumericFormatter implements ActionListener {
                 CoreActionType.SERVER_DISCONNECTED);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void processEvent(final ActionType type, final StringBuffer format,
             final Object... arguments) {

src/com/dmdirc/actions/metatypes/ActionEvents.java

@@ -50,25 +50,21 @@ public enum ActionEvents implements ActionMetaType {
         this.argTypes = argTypes;
     }
 
-    /** {@inheritDoc} */
     @Override
     public int getArity() {
         return argNames.length;
     }
 
-    /** {@inheritDoc} */
     @Override
     public Class[] getArgTypes() {
         return argTypes;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String[] getArgNames() {
         return argNames;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String getGroup() {
         return "Action Events";

src/com/dmdirc/actions/metatypes/ChannelEvents.java

@@ -42,23 +42,23 @@ public enum ChannelEvents implements ActionMetaType {
     CHANNEL_TOPICEVENT(new String[]{"channel", "topic"}, Channel.class, Topic.class),
     /** Channel CTCP type. */
     CHANNEL_CTCP(new String[]{"channel", "user", "type", "content"}, Channel.class,
-    ChannelClientInfo.class, String.class, String.class),
+            ChannelClientInfo.class, String.class, String.class),
     /** Channel event with source. */
     CHANNEL_SOURCED_EVENT(new String[]{"channel", "user"}, Channel.class, ChannelClientInfo.class),
     /** Chanel event with source and argument. */
     CHANNEL_SOURCED_EVENT_WITH_ARG(new String[]{"channel", "user", "message"}, Channel.class,
-    ChannelClientInfo.class, String.class),
+            ChannelClientInfo.class, String.class),
     /** Chanel event with source and nickname. */
     CHANNEL_NICKEVENT(new String[]{"channel", "user", "old nickname"}, Channel.class,
-    ChannelClientInfo.class, String.class),
+            ChannelClientInfo.class, String.class),
     /** Chanel event with source, message and mode character argument.
      *
      * @since 0.6.3m2 */
     CHANNEL_SOURCED_EVENT_WITH_CHARARG(new String[]{"channel", "user", "mode", "message"},
-    Channel.class, ChannelClientInfo.class, String.class, String.class),
+            Channel.class, ChannelClientInfo.class, String.class, String.class),
     /** Channel event with source and victim. */
     CHANNEL_SOURCED_EVENT_WITH_VICTIM(new String[]{"channel", "user", "victim", "message"},
-    Channel.class, ChannelClientInfo.class, ChannelClientInfo.class, String.class);
+            Channel.class, ChannelClientInfo.class, ChannelClientInfo.class, String.class);
     /** The names of the arguments for this meta type. */
     private String[] argNames;
     /** The classes of the arguments for this meta type. */
@@ -75,25 +75,21 @@ public enum ChannelEvents implements ActionMetaType {
         this.argTypes = argTypes;
     }
 
-    /** {@inheritDoc} */
     @Override
     public int getArity() {
         return argNames.length;
     }
 
-    /** {@inheritDoc} */
     @Override
     public Class[] getArgTypes() {
         return argTypes;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String[] getArgNames() {
         return argNames;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String getGroup() {
         return "Channel Events";

src/com/dmdirc/actions/metatypes/ClientEvents.java

@@ -46,24 +46,24 @@ public enum ClientEvents implements ActionMetaType {
     WINDOW_EVENT_WITH_MESSAGE(new String[]{"window", "message"}, FrameContainer.class, String.class),
     /** A popup-related event. */
     POPUP_EVENT(new String[]{"popup type", "popup", "configuration provider"}, PopupType.class,
-    PopupMenu.class, AggregateConfigProvider.class),
+            PopupMenu.class, AggregateConfigProvider.class),
     /** Client event type, with a key argument. */
     CLIENT_EVENT_WITH_KEY(new String[]{"key event"}, KeyStroke.class),
     /** Client event with an origin and
      * editable buffer. */
     CLIENT_EVENT_WITH_BUFFER(new String[]{"origin", "buffer"}, FrameContainer.class,
-    StringBuffer.class),
+            StringBuffer.class),
     /** Client event with preferences manager. */
     CLIENT_EVENT_WITH_PREFS(new String[]{"preferences manager"}, PreferencesDialogModel.class),
     /** Client event with preferences category. */
     CLIENT_EVENT_WITH_PREFS_CAT(new String[]{"preferences category", "is server"},
-    PreferencesCategory.class, Boolean.class),
+            PreferencesCategory.class, Boolean.class),
     /** Client event with a styled doc. */
     CLIENT_EVENT_WITH_STYLE(new String[]{"styled document", "start offset", "length"},
-    StyledDocument.class, Integer.class, Integer.class),
+            StyledDocument.class, Integer.class, Integer.class),
     /** Unknown command event type. */
     UNKNOWN_COMMAND(new String[]{"source", "command", "arguments"}, FrameContainer.class,
-    String.class, String[].class);
+            String.class, String[].class);
     /** The names of the arguments for this meta type. */
     private String[] argNames;
     /** The classes of the arguments for this meta type. */
@@ -80,25 +80,21 @@ public enum ClientEvents implements ActionMetaType {
         this.argTypes = argTypes;
     }
 
-    /** {@inheritDoc} */
     @Override
     public int getArity() {
         return argNames.length;
     }
 
-    /** {@inheritDoc} */
     @Override
     public Class[] getArgTypes() {
         return argTypes;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String[] getArgNames() {
         return argNames;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String getGroup() {
         return "General Events";

src/com/dmdirc/actions/metatypes/LinkEvents.java

@@ -52,25 +52,21 @@ public enum LinkEvents implements ActionMetaType {
         this.argTypes = argTypes;
     }
 
-    /** {@inheritDoc} */
     @Override
     public int getArity() {
         return argNames.length;
     }
 
-    /** {@inheritDoc} */
     @Override
     public Class[] getArgTypes() {
         return argTypes;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String[] getArgNames() {
         return argNames;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String getGroup() {
         return "Link Events";

src/com/dmdirc/actions/metatypes/PluginEvents.java

@@ -48,25 +48,21 @@ public enum PluginEvents implements ActionMetaType {
         this.argTypes = argTypes;
     }
 
-    /** {@inheritDoc} */
     @Override
     public int getArity() {
         return argNames.length;
     }
 
-    /** {@inheritDoc} */
     @Override
     public Class[] getArgTypes() {
         return argTypes;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String[] getArgNames() {
         return argNames;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String getGroup() {
         return "Plugin Events";

src/com/dmdirc/actions/metatypes/QueryEvents.java

@@ -37,7 +37,7 @@ public enum QueryEvents implements ActionMetaType {
     QUERY_EVENT_WITH_ARG(new String[]{"query", "message"}, Query.class, String.class),
     /** Query event with argument and source. */
     QUERY_SOURCED_EVENT_WITH_ARG(new String[]{"query", "source", "message"}, Query.class,
-    ClientInfo.class, String.class);
+            ClientInfo.class, String.class);
     /** The names of the arguments for this meta type. */
     private String[] argNames;
     /** The classes of the arguments for this meta type. */
@@ -54,25 +54,21 @@ public enum QueryEvents implements ActionMetaType {
         this.argTypes = argTypes;
     }
 
-    /** {@inheritDoc} */
     @Override
     public int getArity() {
         return argNames.length;
     }
 
-    /** {@inheritDoc} */
     @Override
     public Class[] getArgTypes() {
         return argTypes;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String[] getArgNames() {
         return argNames;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String getGroup() {
         return "Query Events";

src/com/dmdirc/actions/metatypes/ServerEvents.java

@@ -35,24 +35,24 @@ public enum ServerEvents implements ActionMetaType {
     SERVER_PING(new String[]{"server", "ping"}, Connection.class, Long.class),
     /** Server numeric event type. */
     SERVER_NUMERIC(new String[]{"server", "numeric", "arguments"}, Connection.class, Integer.class,
-    String[].class),
+            String[].class),
     /** Server event with argument. */
     SERVER_EVENT_WITH_ARG(new String[]{"server", "message"}, Connection.class, String.class),
     /** Server nick change. */
     SERVER_NICKCHANGE(new String[]{"server", "old nickname", "new nickname"}, Connection.class,
-    String.class, String.class),
+            String.class, String.class),
     /** Server event, with source and argument. */
     SERVER_SOURCED_EVENT_WITH_ARG(new String[]{"server", "user", "message"}, Connection.class,
-    ClientInfo.class, String.class),
+            ClientInfo.class, String.class),
     /** Server CTCP event. */
     SERVER_CTCP_EVENT(new String[]{"server", "user", "type", "content"}, Connection.class,
-    ClientInfo.class, String.class, String.class),
+            ClientInfo.class, String.class, String.class),
     /** Server event with argument. */
     SERVER_UNKNOWN_EVENT(new String[]{"server", "source", "target", "message"}, Connection.class,
-    String.class, String.class, String.class),
+            String.class, String.class, String.class),
     /** Server invite event. */
     SERVER_INVITE(new String[]{"server", "source", "channel"}, Connection.class, ClientInfo.class,
-    String.class),
+            String.class),
     /** Server event type. */
     SERVER_EVENT(new String[]{"server"}, Connection.class);
     /** The names of the arguments for this meta type. */
@@ -71,25 +71,21 @@ public enum ServerEvents implements ActionMetaType {
         this.argTypes = argTypes;
     }
 
-    /** {@inheritDoc} */
     @Override
     public int getArity() {
         return argNames.length;
     }
 
-    /** {@inheritDoc} */
     @Override
     public Class[] getArgTypes() {
         return argTypes;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String[] getArgNames() {
         return argNames;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String getGroup() {
         return "Server/Private Events";

src/com/dmdirc/actions/package-info.java

@@ -29,9 +29,10 @@
  * {@link com.dmdirc.interfaces.actions.ActionType}, which has both a user-friendly name and an
  * internal name, as well as a meta-type which describes the arguments it takes.
  *
- * <p>For example, when a message on a channel is received, the client looks for actions that
- * respond to the {@link com.dmdirc.actions.CoreActionType#CHANNEL_MESSAGE} action type. The channel
- * message type has a meta-type of
+ * <p>
+ * For example, when a message on a channel is received, the client looks for actions that respond
+ * to the {@link com.dmdirc.actions.CoreActionType#CHANNEL_MESSAGE} action type. The channel message
+ * type has a meta-type of
  * {@link com.dmdirc.actions.metatypes.ChannelEvents#CHANNEL_SOURCED_EVENT_WITH_ARG} which says that
  * the event will come with three arguments: a channel, a user, and a message. It also defines the
  * types of those arguments ({@link com.dmdirc.Channel},
@@ -44,7 +45,8 @@
  * rules concerning the state of the client, or the event's arguments. There are two types of
  * condition: component-based and string-based.
  *
- * <p>Component-based conditions start off with one of the action's arguments, and then apply one or
+ * <p>
+ * Component-based conditions start off with one of the action's arguments, and then apply one or
  * more components to it to get some useful property. Components all implement
  * {@link com.dmdirc.interfaces.actions.ActionComponent} and essentially transform one object into
  * another, somehow. A component may take a {@link com.dmdirc.Channel} object and return that
@@ -52,22 +54,26 @@
  * (these components are implemented in {@link com.dmdirc.actions.CoreActionComponent#CHANNEL_NAME}
  * and {@link com.dmdirc.actions.CoreActionComponent#STRING_LENGTH}).
  *
- * <p>A component based action could be as simple as "the message's content", or as complicated as
- * "the channel's server's network name's length". These chains of components are handled by an
+ * <p>
+ * A component based action could be as simple as "the message's content", or as complicated as "the
+ * channel's server's network name's length". These chains of components are handled by an
  * {@link ActionComponentChain}.
  *
- * <p>String-based conditions simply start off with a plain string, which is subject to substitution
- * as described below.
+ * <p>
+ * String-based conditions simply start off with a plain string, which is subject to substitution as
+ * described below.
  *
- * <p>Action conditions also specify a comparison. These define various methods of comparing
- * objects, such as checking two strings are equal
+ * <p>
+ * Action conditions also specify a comparison. These define various methods of comparing objects,
+ * such as checking two strings are equal
  * ({@link com.dmdirc.actions.CoreActionComparison#STRING_EQUALS}) or that an integer is greater
  * than a pre-defined value ({@link com.dmdirc.actions.CoreActionComparison#INT_GREATER}). All
  * comparisons implement {@link com.dmdirc.interfaces.actions.ActionComparison}. The second argument
  * is always a string provided by the user.
  *
- * <p>Finally, if more than one condition is present the user can decide how they are matched. The
- * two most common and straight-forward options are a conjunction (where all the conditions must be
+ * <p>
+ * Finally, if more than one condition is present the user can decide how they are matched. The two
+ * most common and straight-forward options are a conjunction (where all the conditions must be
  * true) and a disjunction (where one of the conditions must be true). Users can also specify their
  * own, more complicated, rules such as "condition 1 AND (condition 2 OR condition 3)". These are
  * all expressed as a {@link ConditionTree}.
@@ -81,7 +87,8 @@
  * message the user had entered the command {@code /part}, then the client would part the channel
  * where the message was received.
  *
- * <p>Commands and condition arguments are subject to action substitutions. This allows users to
+ * <p>
+ * Commands and condition arguments are subject to action substitutions. This allows users to
  * include various dynamic properties in their responses or conditions. Substitutions are prefixed
  * with a {@code $} character, and come in several varieties:
  *

src/com/dmdirc/actions/validators/ActionNameValidator.java

@@ -55,7 +55,6 @@ public class ActionNameValidator implements Validator<String> {
         this.originalName = originalName;
     }
 
-    /** {@inheritDoc} */
     @Override
     public ValidationResponse validate(final String object) {
         final List<Action> actions = group.getActions();

src/com/dmdirc/actions/validators/ConditionRuleValidator.java

@@ -53,7 +53,6 @@ public class ConditionRuleValidator implements Validator<String> {
         this.args = args;
     }
 
-    /** {@inheritDoc} */
     @Override
     public ValidationResponse validate(final String object) {
         final ConditionTree tree = ConditionTree.parseString(object);

src/com/dmdirc/actions/wrappers/AliasWrapper.java

@@ -80,7 +80,6 @@ public class AliasWrapper extends ActionGroup {
         return new ArrayList<>(aliases);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void add(final Action action) {
         if (action.getTriggers()[0].equals(CoreActionType.UNKNOWN_COMMAND)) {
@@ -107,7 +106,6 @@ public class AliasWrapper extends ActionGroup {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void remove(final Action action) {
         if (action.getTriggers()[0].equals(CoreActionType.UNKNOWN_COMMAND)) {
@@ -146,13 +144,11 @@ public class AliasWrapper extends ActionGroup {
         return null;
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean isDelible() {
         return false;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String getDescription() {
         return "Aliases allow you to create new commands that invoke one or "

src/com/dmdirc/actions/wrappers/PerformType.java

@@ -45,7 +45,6 @@ public enum PerformType {
         friendlyName = name;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String toString() {
         return friendlyName;

src/com/dmdirc/actions/wrappers/PerformWrapper.java

@@ -67,7 +67,6 @@ public class PerformWrapper extends ActionGroup {
         this.actionFactory = actionFactory;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void add(final Action action) {
         if (action.getTriggers().length != 1) {
@@ -92,7 +91,6 @@ public class PerformWrapper extends ActionGroup {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void deleteAction(final Action action) {
         synchronized (this) {
@@ -226,8 +224,7 @@ public class PerformWrapper extends ActionGroup {
     private Action createAction(final String server, final String network,
             final String profile) {
         final List<ActionCondition> conditions = new ArrayList<>();
-        final CoreActionComponent component =
-                server.isEmpty() ? CoreActionComponent.SERVER_NETWORK
+        final CoreActionComponent component = server.isEmpty() ? CoreActionComponent.SERVER_NETWORK
                 : CoreActionComponent.SERVER_NAME;
 
         conditions.add(new ActionCondition(0, component,
@@ -236,7 +233,7 @@ public class PerformWrapper extends ActionGroup {
         if (profile != null) {
             conditions.add(new ActionCondition(0,
                     new ActionComponentChain(Connection.class, PP_COMP_NAME, ActionManager.
-                    getActionManager()),
+                            getActionManager()),
                     CoreActionComparison.STRING_EQUALS, profile));
         }
 
@@ -283,13 +280,11 @@ public class PerformWrapper extends ActionGroup {
         return null;
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean isDelible() {
         return false;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String getDescription() {
         return "Performs allow you to automatically execute commands when"
@@ -374,7 +369,6 @@ public class PerformWrapper extends ActionGroup {
             return type;
         }
 
-        /** {@inheritDoc} */
         @Override
         public boolean equals(final Object obj) {
             if (obj == null || getClass() != obj.getClass()) {
@@ -395,7 +389,6 @@ public class PerformWrapper extends ActionGroup {
             return true;
         }
 
-        /** {@inheritDoc} */
         @Override
         public int hashCode() {
             int hash = 7;

src/com/dmdirc/commandline/RemoteServer.java

@@ -57,7 +57,6 @@ public class RemoteServer implements RemoteInterface {
         this.serverManager = serverManager;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void connect(final List<URI> addresses) throws RemoteException {
         for (URI address : addresses) {

src/com/dmdirc/commandparser/CommandInfo.java

@@ -38,13 +38,11 @@ public interface CommandInfo {
      * Returns a string representing the help message for this command.
      * <p>
      * The help text should generally be one line, and must start with the name of the command. It
-     * should then summarise the arguments of that command, using
-     * <code>&lt;angled&gt;</code> brackets for required arguments, and
-     * <code>[square]</code> brackets for optional arguments. Where multiple possibilities exist,
-     * they are typically separated by a pipe (
-     * <code>|</code>), for example:
-     * <code>command [--arg1|--arg2]</code>. The usage summary should then be followed by a dash and
-     * a brief summary of the purpose of the command.
+     * should then summarise the arguments of that command, using <code>&lt;angled&gt;</code>
+     * brackets for required arguments, and <code>[square]</code> brackets for optional arguments.
+     * Where multiple possibilities exist, they are typically separated by a pipe ( <code>|</code>),
+     * for example: <code>command [--arg1|--arg2]</code>. The usage summary should then be followed
+     * by a dash and a brief summary of the purpose of the command.
      * <p>
      * A typical help message would look similar to:
      * <p>

src/com/dmdirc/commandparser/CommandManager.java

@@ -86,13 +86,11 @@ public class CommandManager implements CommandController {
         configManager.getBinder().bind(this, CommandManager.class);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void registerCommand(final Command command, final CommandInfo info) {
         registerCommand(info, command, true);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void unregisterCommand(final CommandInfo info) {
         registerCommand(info, commands.get(info), false);
@@ -198,7 +196,6 @@ public class CommandManager implements CommandController {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void loadCommands(final CommandParser parser,
             final CommandType... supertypes) {
@@ -213,13 +210,11 @@ public class CommandManager implements CommandController {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public Map.Entry<CommandInfo, Command> getCommand(final String name) {
         return getCommand(null, name);
     }
 
-    /** {@inheritDoc} */
     @Override
     public Map.Entry<CommandInfo, Command> getCommand(final CommandType type,
             final String name) {
@@ -228,14 +223,12 @@ public class CommandManager implements CommandController {
         return res.isEmpty() ? null : res.entrySet().iterator().next();
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean isChannelCommand(final String command) {
         return getCommand(CommandType.TYPE_CHANNEL, command) != null
                 || getCommand(CommandType.TYPE_CHAT, command) != null;
     }
 
-    /** {@inheritDoc} */
     @Override
     public List<String> getCommandNames(final CommandType type) {
         final List<String> res = new ArrayList<>();
@@ -247,7 +240,6 @@ public class CommandManager implements CommandController {
         return res;
     }
 
-    /** {@inheritDoc} */
     @Override
     public Map<CommandInfo, Command> getCommands(final CommandType type) {
         return getCommands(type, null);

src/com/dmdirc/commandparser/CommandType.java

@@ -32,8 +32,7 @@ public enum CommandType {
     /** A server command, which only makes sense in the context of a
      * connection. */
     TYPE_SERVER,
-    /** A chat command, which needs a MessageTarget to make
-     * sense. */
+    /** A chat command, which needs a MessageTarget to make sense. */
     TYPE_CHAT,
     /** A channel command. */
     TYPE_CHANNEL,
@@ -57,7 +56,6 @@ public enum CommandType {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public String toString() {
         switch (this) {

src/com/dmdirc/commandparser/commands/channel/Ban.java

@@ -59,7 +59,6 @@ public class Ban extends Command implements IntelligentCommand {
         super(controller);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -81,7 +80,6 @@ public class Ban extends Command implements IntelligentCommand {
         channel.getChannelInfo().flushModes();
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/commandparser/commands/channel/Cycle.java

@@ -57,7 +57,6 @@ public class Cycle extends Command {
         super(controller);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {

src/com/dmdirc/commandparser/commands/channel/Invite.java

@@ -62,7 +62,6 @@ public class Invite extends Command implements ExternalCommand {
         super(controller);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -77,7 +76,6 @@ public class Invite extends Command implements ExternalCommand {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin, final Server server,
             final String channel, final boolean isSilent, final CommandArguments args) {

src/com/dmdirc/commandparser/commands/channel/KickReason.java

@@ -62,7 +62,6 @@ public class KickReason extends Command implements IntelligentCommand {
         super(controller);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -84,7 +83,6 @@ public class KickReason extends Command implements IntelligentCommand {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/commandparser/commands/channel/Mode.java

@@ -64,7 +64,6 @@ public class Mode extends Command implements IntelligentCommand,
         super(controller);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -79,7 +78,6 @@ public class Mode extends Command implements IntelligentCommand,
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin, final Server server,
             final String channel, final boolean isSilent, final CommandArguments args) {
@@ -90,7 +88,6 @@ public class Mode extends Command implements IntelligentCommand,
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/commandparser/commands/channel/Names.java

@@ -62,7 +62,6 @@ public class Names extends Command implements IntelligentCommand,
         super(controller);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -71,14 +70,12 @@ public class Names extends Command implements IntelligentCommand,
                 + channel.getChannelInfo().getName());
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin, final Server server,
             final String channel, final boolean isSilent, final CommandArguments args) {
         server.getParser().sendRawMessage("NAMES " + channel);
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/commandparser/commands/channel/Part.java

@@ -57,7 +57,6 @@ public class Part extends Command {
         super(controller);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {

src/com/dmdirc/commandparser/commands/channel/SetNickColour.java

@@ -67,7 +67,6 @@ public class SetNickColour extends Command implements IntelligentCommand {
         this.colourManager = colourManager;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -131,7 +130,6 @@ public class SetNickColour extends Command implements IntelligentCommand {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/commandparser/commands/channel/ShowTopic.java

@@ -60,7 +60,6 @@ public class ShowTopic extends Command implements ExternalCommand {
         super(controller);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -83,7 +82,6 @@ public class ShowTopic extends Command implements ExternalCommand {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin, final Server server,
             final String channel, final boolean isSilent, final CommandArguments args) {

src/com/dmdirc/commandparser/commands/chat/Me.java

@@ -59,7 +59,6 @@ public class Me extends Command implements ValidatingCommand {
         super(controller);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -71,7 +70,6 @@ public class Me extends Command implements ValidatingCommand {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public ValidationResponse validateArguments(
             final WritableFrameContainer origin,

src/com/dmdirc/commandparser/commands/flags/CommandFlagHandler.java

@@ -62,8 +62,7 @@ public class CommandFlagHandler {
     /**
      * Processes the specified arguments and parses out command flags. If the specified arguments
      * aren't valid given the flags belonging to this command flag handler, an error message is sent
-     * to the origin and
-     * <code>null</code> is returned from this method.
+     * to the origin and <code>null</code> is returned from this method.
      *
      * @param origin    The container where the command was entered
      * @param arguments The arguments passed to the command

src/com/dmdirc/commandparser/commands/flags/CommandFlagResult.java

@@ -72,7 +72,7 @@ public class CommandFlagResult {
         return flag == null ? (offsets.get(flag) > arguments.getArguments().length
                 ? "" : arguments.getArgumentsAsString(offsets.get(flag)))
                 : arguments.getArgumentsAsString(offsets.get(flag),
-                offsets.get(flag) + flag.getDelayedArgs() + flag.getImmediateArgs() - 1);
+                        offsets.get(flag) + flag.getDelayedArgs() + flag.getImmediateArgs() - 1);
     }
 
     /**

src/com/dmdirc/commandparser/commands/global/AliasCommand.java

@@ -72,7 +72,6 @@ public class AliasCommand extends Command implements IntelligentCommand {
         this.aliasWrapper = aliasWrapper;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -137,7 +136,6 @@ public class AliasCommand extends Command implements IntelligentCommand {
         return false;
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/commandparser/commands/global/AllServers.java

@@ -62,7 +62,6 @@ public class AllServers extends Command implements IntelligentCommand {
         this.serverManager = serverManager;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -73,7 +72,6 @@ public class AllServers extends Command implements IntelligentCommand {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/commandparser/commands/global/Clear.java

@@ -55,14 +55,12 @@ public class Clear extends Command implements IntelligentCommand {
         super(controller);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         origin.getDocument().clear();
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/commandparser/commands/global/Echo.java

@@ -78,7 +78,6 @@ public class Echo extends Command implements IntelligentCommand {
         handler = new CommandFlagHandler(timeStampFlag, targetFlag);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -123,7 +122,6 @@ public class Echo extends Command implements IntelligentCommand {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/commandparser/commands/global/Exit.java

@@ -59,7 +59,6 @@ public class Exit extends Command {
         this.controller = lifecycleController;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {

src/com/dmdirc/commandparser/commands/global/Help.java

@@ -65,7 +65,6 @@ public class Help extends Command implements IntelligentCommand {
         super(controller);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -145,7 +144,6 @@ public class Help extends Command implements IntelligentCommand {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/commandparser/commands/global/Ifplugin.java

@@ -74,7 +74,6 @@ public class Ifplugin extends Command implements IntelligentCommand {
         this.globalCommandParserProvider = globalCommandParserProvider;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -106,7 +105,6 @@ public class Ifplugin extends Command implements IntelligentCommand {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/commandparser/commands/global/LoadPlugin.java

@@ -62,7 +62,6 @@ public class LoadPlugin extends Command implements IntelligentCommand {
         this.pluginManager = pluginManager;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -95,7 +94,6 @@ public class LoadPlugin extends Command implements IntelligentCommand {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/commandparser/commands/global/NewServer.java

@@ -87,7 +87,6 @@ public class NewServer extends Command implements IntelligentCommand {
         this.uriParser = uriParser;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -111,7 +110,6 @@ public class NewServer extends Command implements IntelligentCommand {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/commandparser/commands/global/Notify.java

@@ -61,7 +61,6 @@ public class Notify extends Command implements IntelligentCommand {
         this.colourManager = colourManager;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -83,7 +82,6 @@ public class Notify extends Command implements IntelligentCommand {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/commandparser/commands/global/OpenWindow.java

@@ -79,7 +79,6 @@ public class OpenWindow extends Command implements IntelligentCommand {
         this.configProvider = configProvider;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -133,7 +132,6 @@ public class OpenWindow extends Command implements IntelligentCommand {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/commandparser/commands/global/ReloadActions.java

@@ -56,7 +56,6 @@ public final class ReloadActions extends Command implements IntelligentCommand {
         super(controller);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -64,7 +63,6 @@ public final class ReloadActions extends Command implements IntelligentCommand {
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Actions reloaded.");
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/commandparser/commands/global/ReloadIdentities.java

@@ -61,7 +61,6 @@ public class ReloadIdentities extends Command implements IntelligentCommand {
         this.identityController = identityController;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -70,7 +69,6 @@ public class ReloadIdentities extends Command implements IntelligentCommand {
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Identities reloaded.");
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/commandparser/commands/global/ReloadPlugin.java

@@ -61,7 +61,6 @@ public class ReloadPlugin extends Command implements IntelligentCommand {
         this.pluginManager = pluginManager;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -81,7 +80,6 @@ public class ReloadPlugin extends Command implements IntelligentCommand {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/commandparser/commands/global/SaveConfig.java

@@ -61,7 +61,6 @@ public final class SaveConfig extends Command implements IntelligentCommand {
         this.identityController = identityController;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -70,7 +69,6 @@ public final class SaveConfig extends Command implements IntelligentCommand {
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Configuration file saved.");
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/commandparser/commands/global/SetCommand.java

@@ -99,7 +99,6 @@ public class SetCommand extends Command implements IntelligentCommand {
         handler = new CommandFlagHandler(serverFlag, channelFlag, unsetFlag, appendFlag);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -300,7 +299,6 @@ public class SetCommand extends Command implements IntelligentCommand {
         sendLine(origin, isSilent, FORMAT_OUTPUT, domain + "." + option + " has been unset.");
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/commandparser/commands/global/UnloadPlugin.java

@@ -61,7 +61,6 @@ public class UnloadPlugin extends Command implements IntelligentCommand {
         this.pluginManager = pluginManager;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -82,7 +81,6 @@ public class UnloadPlugin extends Command implements IntelligentCommand {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/commandparser/commands/server/AllChannels.java

@@ -58,7 +58,6 @@ public class AllChannels extends Command implements IntelligentCommand {
         super(controller);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -71,7 +70,6 @@ public class AllChannels extends Command implements IntelligentCommand {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/commandparser/commands/server/Away.java

@@ -56,7 +56,6 @@ public class Away extends Command {
         super(controller);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {

src/com/dmdirc/commandparser/commands/server/Back.java

@@ -58,7 +58,6 @@ public class Back extends Command implements IntelligentCommand {
         super(controller);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -66,7 +65,6 @@ public class Back extends Command implements IntelligentCommand {
         server.getParser().getLocalClient().setBack();
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/commandparser/commands/server/ChangeServer.java

@@ -64,7 +64,6 @@ public class ChangeServer extends Command {
         this.uriParser = uriParser;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {

src/com/dmdirc/commandparser/commands/server/Ctcp.java

@@ -60,7 +60,6 @@ public class Ctcp extends Command implements IntelligentCommand {
         super(controller);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -75,7 +74,6 @@ public class Ctcp extends Command implements IntelligentCommand {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/commandparser/commands/server/Disconnect.java

@@ -55,7 +55,6 @@ public class Disconnect extends Command {
         super(controller);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {

src/com/dmdirc/commandparser/commands/server/Ignore.java

@@ -63,7 +63,6 @@ public class Ignore extends Command implements IntelligentCommand {
         super(controller);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -171,7 +170,6 @@ public class Ignore extends Command implements IntelligentCommand {
                 + "'.");
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/commandparser/commands/server/JoinChannelCommand.java

@@ -76,7 +76,6 @@ public class JoinChannelCommand extends Command implements
         actionController.registerListener(this, CoreActionType.CLIENT_LINE_ADDED);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -102,7 +101,6 @@ public class JoinChannelCommand extends Command implements
         server.join(!args.isSilent(), channels.toArray(new ChannelJoinRequest[channels.size()]));
     }
 
-    /** {@inheritDoc} */
     @Override
     public void processEvent(final ActionType type, final StringBuffer format,
             final Object... arguments) {
@@ -118,7 +116,6 @@ public class JoinChannelCommand extends Command implements
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/commandparser/commands/server/Message.java

@@ -64,7 +64,6 @@ public class Message extends Command implements IntelligentCommand,
         super(controller);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -98,7 +97,6 @@ public class Message extends Command implements IntelligentCommand,
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {
@@ -114,7 +112,6 @@ public class Message extends Command implements IntelligentCommand,
         return res;
     }
 
-    /** {@inheritDoc} */
     @Override
     public int getLineCount(final WritableFrameContainer origin,
             final CommandArguments arguments) {

src/com/dmdirc/commandparser/commands/server/Nick.java

@@ -60,7 +60,6 @@ public class Nick extends Command implements IntelligentCommand {
         super(controller);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -73,7 +72,6 @@ public class Nick extends Command implements IntelligentCommand {
         server.getParser().getLocalClient().setNickname(args.getArguments()[0]);
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/commandparser/commands/server/Notice.java

@@ -60,7 +60,6 @@ public class Notice extends Command implements IntelligentCommand {
         super(controller);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -75,7 +74,6 @@ public class Notice extends Command implements IntelligentCommand {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/commandparser/commands/server/OpenQuery.java

@@ -63,7 +63,6 @@ public class OpenQuery extends Command implements IntelligentCommand,
         super(controller);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -97,7 +96,6 @@ public class OpenQuery extends Command implements IntelligentCommand,
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {
@@ -111,7 +109,6 @@ public class OpenQuery extends Command implements IntelligentCommand,
         return targets;
     }
 
-    /** {@inheritDoc} */
     @Override
     public int getLineCount(final WritableFrameContainer origin,
             final CommandArguments arguments) {

src/com/dmdirc/commandparser/commands/server/Raw.java

@@ -57,7 +57,6 @@ public class Raw extends Command {
         super(controller);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {

src/com/dmdirc/commandparser/commands/server/RawServerCommand.java

@@ -53,7 +53,6 @@ public class RawServerCommand extends Command implements CommandInfo {
         myName = command;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
@@ -61,19 +60,16 @@ public class RawServerCommand extends Command implements CommandInfo {
         server.getParser().sendRawMessage(myName.toUpperCase() + " " + args.getArgumentsAsString());
     }
 
-    /** {@inheritDoc} */
     @Override
     public String getName() {
         return myName;
     }
 
-    /** {@inheritDoc} */
     @Override
     public CommandType getType() {
         return CommandType.TYPE_SERVER;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String getHelp() {
         return myName + " [arguments] - sends a " + myName + " command to the server";

src/com/dmdirc/commandparser/commands/server/Reconnect.java

@@ -55,7 +55,6 @@ public class Reconnect extends Command {
         super(controller);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {

src/com/dmdirc/commandparser/commands/server/Umode.java

@@ -58,7 +58,6 @@ public class Umode extends Command {
         super(controller);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {

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

@@ -59,7 +59,6 @@ public class ChannelCommandParser extends ChatCommandParser {
         super(server, commandController);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void setOwner(final FrameContainer owner) {
         if (channel == null) {
@@ -69,7 +68,6 @@ public class ChannelCommandParser extends ChatCommandParser {
         super.setOwner(owner);
     }
 
-    /** {@inheritDoc} */
     @Override
     protected void loadCommands() {
         commandManager.loadCommands(this, CommandType.TYPE_GLOBAL,

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

@@ -60,7 +60,6 @@ public class ChatCommandParser extends ServerCommandParser {
         super.setOwner(server);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void setOwner(final FrameContainer owner) {
         if (this.owner == null) {
@@ -91,7 +90,6 @@ public class ChatCommandParser extends ServerCommandParser {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     protected void handleNonCommand(final FrameContainer origin,
             final String line) {

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

@@ -63,7 +63,6 @@ public class GlobalCommandParser extends CommandParser {
         super(configManager, commandManager);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void setOwner(final FrameContainer owner) {
         // Don't care

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

@@ -60,7 +60,6 @@ public class QueryCommandParser extends ChatCommandParser {
         super(server, commandController);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void setOwner(final FrameContainer owner) {
         if (query == null) {

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

@@ -62,7 +62,6 @@ public class ServerCommandParser extends GlobalCommandParser {
      */
     private Server server;
 
-    /** {@inheritDoc} */
     @Override
     public void setOwner(final FrameContainer owner) {
         if (server == null && owner instanceof Server) {

src/com/dmdirc/config/BaseConfigProvider.java

@@ -37,16 +37,16 @@ import java.util.List;
 /**
  * Defines methods to get options from a config provider in various forms.
  *
- * <p>This implementation supports the idea of optional/disabled settings. This is where values may
- * be prefixed with the strings
- * <code>true:</code> or
- * <code>false:</code>, where the former has no effect on the value of the setting, and the latter
- * indicates that the user wishes to disable the setting.
+ * <p>
+ * This implementation supports the idea of optional/disabled settings. This is where values may be
+ * prefixed with the strings <code>true:</code> or <code>false:</code>, where the former has no
+ * effect on the value of the setting, and the latter indicates that the user wishes to disable the
+ * setting.
  *
- * <p>Disabled settings allow for optional settings to have default values; a value can be added
- * with the
- * <code>false:</code> prefix which effectively disables the default value and makes the setting act
- * as though it does not have a value. Note that for this sort of behaviour to make sense, it
+ * <p>
+ * Disabled settings allow for optional settings to have default values; a value can be added with
+ * the <code>false:</code> prefix which effectively disables the default value and makes the setting
+ * act as though it does not have a value. Note that for this sort of behaviour to make sense, it
  * requires an implementation that takes values from multiple sources, such as a
  * {@link ConfigManager}.
  */
@@ -58,24 +58,20 @@ public abstract class BaseConfigProvider implements ReadOnlyConfigProvider {
     private static final Validator<String> INT_VALIDATOR = new OptionalValidator(
             new NumericalValidator(-1, -1));
 
-    /** {@inheritDoc} */
     @Override
     public String getOption(final String domain, final String option) {
         return getOption(domain, option, PERMISSIVE_VALIDATOR);
     }
 
-    /** {@inheritDoc} */
     @Override
     public abstract String getOption(final String domain,
             final String option, final Validator<String> validator);
 
-    /** {@inheritDoc} */
     @Override
     public boolean hasOptionString(final String domain, final String option) {
         return hasOptionString(domain, option, PERMISSIVE_VALIDATOR);
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean hasOptionString(final String domain, final String option,
             final Validator<String> validator) {
@@ -86,25 +82,21 @@ public abstract class BaseConfigProvider implements ReadOnlyConfigProvider {
                 && !value.startsWith("false:");
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean hasOptionInt(final String domain, final String option) {
         return hasOptionString(domain, option, INT_VALIDATOR);
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean hasOptionChar(final String domain, final String option) {
         return hasOptionString(domain, option);
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean hasOptionBool(final String domain, final String option) {
         return hasOption(domain, option, PERMISSIVE_VALIDATOR);
     }
 
-    /** {@inheritDoc} */
     @Override
     public String getOptionString(final String domain, final String option,
             final boolean required, final Validator<String> validator,
@@ -128,26 +120,22 @@ public abstract class BaseConfigProvider implements ReadOnlyConfigProvider {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public String getOptionString(final String domain, final String option,
             final String... fallbacks) {
         return getOptionString(domain, option, true, PERMISSIVE_VALIDATOR, fallbacks);
     }
 
-    /** {@inheritDoc} */
     @Override
     public char getOptionChar(final String domain, final String option) {
         return getOption(domain, option).charAt(0);
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean getOptionBool(final String domain, final String option) {
         return Boolean.parseBoolean(getOption(domain, option));
     }
 
-    /** {@inheritDoc} */
     @Override
     public List<String> getOptionList(final String domain, final String option,
             final boolean trimEmpty) {
@@ -164,20 +152,17 @@ public abstract class BaseConfigProvider implements ReadOnlyConfigProvider {
         return res;
     }
 
-    /** {@inheritDoc} */
     @Override
     public List<String> getOptionList(final String domain, final String option) {
         return getOptionList(domain, option, true);
     }
 
-    /** {@inheritDoc} */
     @Override
     public Integer getOptionInt(final String domain, final String option,
             final String... fallbacks) {
         return getOptionInt(domain, option, true, fallbacks);
     }
 
-    /** {@inheritDoc} */
     @Override
     public Integer getOptionInt(final String domain, final String option,
             final boolean required, final String... fallbacks) {