Typo fixes.

Change-Id: I402d52e9bd09192fee54584e24f0eff33fd581e4
Depends-On: I2028d8c1ddd14b276f373b9400265b25f0e5e939
Reviewed-on: http://gerrit.dmdirc.com/3697
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/FrameContainer.java

@@ -97,7 +97,7 @@ public abstract class FrameContainer {
     private final Object documentSync = new Object();
     /** The manager to use to manage our event bus. */
     private final ChildEventBusManager eventBusManager;
-    /** Event bus to despatch events to. */
+    /** Event bus to dispatch events to. */
     private final EventBus eventBus;
     /** The icon manager to use for this container. */
     private final IconManager iconManager;
@@ -110,7 +110,7 @@ public abstract class FrameContainer {
      */
     private final Optional<CommandParser> commandParser;
     /**
-     * The manager to use to despatch messages to sinks.
+     * The manager to use to dispatch messages to sinks.
      * <p>
      * Only defined if this container is {@link #writable}.
      */
@@ -131,7 +131,7 @@ public abstract class FrameContainer {
      * @param title      The title of this container
      * @param config     The config manager for this container
      * @param urlBuilder The URL builder to use when finding icons.
-     * @param eventBus   The bus to despatch events on.
+     * @param eventBus   The bus to dispatch events on.
      * @param components The UI components that this frame requires
      *
      * @since 0.6.4
@@ -174,8 +174,8 @@ public abstract class FrameContainer {
      * @param urlBuilder         The URL builder to use when finding icons.
      * @param commandParser      The command parser to use for input.
      * @param tabCompleter       The tab completer to use.
-     * @param messageSinkManager The manager to use to despatch notifications.
-     * @param eventBus           The bus to despatch events on.
+     * @param messageSinkManager The manager to use to dispatch notifications.
+     * @param eventBus           The bus to dispatch events on.
      * @param components         The UI components that this frame requires
      *
      * @since 0.6.4
@@ -631,7 +631,7 @@ public abstract class FrameContainer {
     }
 
     /**
-     * Retrieves the tab completer which should be used for this cotnainer.
+     * Retrieves the tab completer which should be used for this container.
      *
      * @return This container's tab completer
      */
@@ -724,7 +724,7 @@ public abstract class FrameContainer {
     /**
      * Processes and displays a notification.
      *
-     * @param date        The date/time at which the event occured
+     * @param date        The date/time at which the event occurred
      * @param messageType The name of the formatter to be used for the message
      * @param args        The arguments for the message
      *
@@ -790,13 +790,13 @@ public abstract class FrameContainer {
      * Handles general server notifications (i.e., ones not tied to a specific window). The user can
      * select where the notifications should go in their config.
      *
-     * @param date        The date/time at which the event occured
+     * @param date        The date/time at which the event occurred
      * @param messageType The type of message that is being sent
      * @param args        The arguments for the message
      */
     public void handleNotification(final Date date, final String messageType, final Object... args) {
         checkState(writable);
-        messageSinkManager.get().despatchMessage(this, date, messageType, args);
+        messageSinkManager.get().dispatchMessage(this, date, messageType, args);
     }
 
     /**

src/com/dmdirc/MessageTarget.java

@@ -49,9 +49,9 @@ public abstract class MessageTarget extends FrameContainer {
      * @param config             The config manager to use for this target
      * @param parser             The command parser for this container
      * @param tabCompleter       The tab completer to use
-     * @param messageSinkManager The sink manager to use to despatch messages.
+     * @param messageSinkManager The sink manager to use to dispatch messages.
      * @param urlBuilder         The URL builder to use when finding icons.
-     * @param eventBus           The bus to despatch events on.
+     * @param eventBus           The bus to dispatch events on.
      * @param components         The UI components that this frame requires
      *
      * @since 0.6.4

src/com/dmdirc/commandparser/CommandArguments.java

@@ -122,7 +122,7 @@ public class CommandArguments {
     }
 
     /**
-     * Retrieves the arguments to the command split into disticnt, whitespace-separated words.
+     * Retrieves the arguments to the command split into distinct, whitespace-separated words.
      *
      * @return An array of 'words' that make up the command's arguments
      */

src/com/dmdirc/commandparser/PopupManager.java

@@ -37,14 +37,14 @@ public class PopupManager {
 
     /** The command controller to use for items. */
     private final CommandController commandController;
-    /** The bus to despatch events on. */
+    /** The bus to dispatch events on. */
     private final EventBus eventBus;
 
     /**
      * Creates a new instance of PopupManager.
      *
      * @param commandController The controller to use for commands.
-     * @param eventBus          The bus to despatch events on.
+     * @param eventBus          The bus to dispatch events on.
      */
     @Inject
     public PopupManager(final CommandController commandController, final EventBus eventBus) {
@@ -98,7 +98,7 @@ public class PopupManager {
      *
      * @param item          The item to be turned into a PopupMenuItem
      * @param type          The type of popup item to create
-     * @param configManager The config manager to beused for the menu
+     * @param configManager The config manager to be used for the menu
      *
      * @return The corresponding PopupMenuItem
      */

src/com/dmdirc/interfaces/actions/ActionComparison.java

@@ -48,7 +48,7 @@ public interface ActionComparison {
     /**
      * Returns a friendly name for this comparison.
      *
-     * @return This comparion's friendly name
+     * @return This comparison's friendly name
      */
     String getName();
 

src/com/dmdirc/interfaces/actions/ActionComponent.java

@@ -78,14 +78,14 @@ public interface ActionComponent {
     Class<?> getType();
 
     /**
-     * Retrives a friendly name for this component.
+     * Retrieves a friendly name for this component.
      *
      * @return This component's friendly name
      */
     String getName();
 
     /**
-     * Retrieve's the internal name of this action component.
+     * Retrieves the internal name of this action component.
      *
      * @since 0.6.4
      * @return The internal name of this component

src/com/dmdirc/interfaces/ui/AliasDialogModel.java

@@ -119,7 +119,7 @@ public interface AliasDialogModel {
      *
      * @return Selected alias minimum arguments
      */
-    int getSelectedAliasMininumArguments();
+    int getSelectedAliasMinimumArguments();
 
     /**
      * Gets the substitution of the selected alias.

src/com/dmdirc/messages/AllMessageSink.java

@@ -47,7 +47,7 @@ public class AllMessageSink implements MessageSink {
     }
 
     @Override
-    public void handleMessage(final MessageSinkManager despatcher,
+    public void handleMessage(final MessageSinkManager dispatcher,
             final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {

src/com/dmdirc/messages/ChannelMessageSink.java

@@ -50,7 +50,7 @@ public class ChannelMessageSink implements MessageSink {
     }
 
     @Override
-    public void handleMessage(final MessageSinkManager despatcher,
+    public void handleMessage(final MessageSinkManager dispatcher,
             final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
@@ -71,8 +71,7 @@ public class ChannelMessageSink implements MessageSink {
                 source.addLine(messageType, date, args);
             } else {
                 // They specified a fallback
-                despatcher.despatchMessage(source, date, messageType,
-                        patternMatches[1], args);
+                dispatcher.dispatchMessage(source, date, messageType, patternMatches[1], args);
             }
         }
     }

src/com/dmdirc/messages/CommonChanelsMessageSink.java → src/com/dmdirc/messages/CommonChannelsMessageSink.java

@@ -36,13 +36,13 @@ import javax.inject.Inject;
  * channels with the user. If no fallback is specified and there are no common channels, the message
  * is despatched to the source.
  */
-public class CommonChanelsMessageSink implements MessageSink {
+public class CommonChannelsMessageSink implements MessageSink {
 
     /** The pattern to use to match this sink. */
     private static final Pattern PATTERN = Pattern.compile("comchans:(.*?)(?:\\s(.*))?");
 
     @Inject
-    public CommonChanelsMessageSink() {
+    public CommonChannelsMessageSink() {
     }
 
     @Override
@@ -51,7 +51,7 @@ public class CommonChanelsMessageSink implements MessageSink {
     }
 
     @Override
-    public void handleMessage(final MessageSinkManager despatcher,
+    public void handleMessage(final MessageSinkManager dispatcher,
             final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
@@ -72,8 +72,7 @@ public class CommonChanelsMessageSink implements MessageSink {
                 source.addLine(messageType, date, args);
             } else {
                 // They specified a fallback
-                despatcher.despatchMessage(source, date, messageType,
-                        patternMatches[1], args);
+                dispatcher.dispatchMessage(source, date, messageType, patternMatches[1], args);
             }
         }
     }

src/com/dmdirc/messages/CustomWindowMessageSink.java

@@ -65,7 +65,7 @@ public class CustomWindowMessageSink implements MessageSink {
     }
 
     @Override
-    public void handleMessage(final MessageSinkManager despatcher,
+    public void handleMessage(final MessageSinkManager dispatcher,
             final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {

src/com/dmdirc/messages/ForkMessageSink.java

@@ -47,12 +47,12 @@ public class ForkMessageSink implements MessageSink {
     }
 
     @Override
-    public void handleMessage(final MessageSinkManager despatcher,
+    public void handleMessage(final MessageSinkManager dispatcher,
             final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
         for (String target : patternMatches[0].split("\\|")) {
-            despatcher.despatchMessage(source, date, target, args);
+            dispatcher.dispatchMessage(source, date, target, args);
         }
     }
 

src/com/dmdirc/messages/FormatMessageSink.java

@@ -47,11 +47,11 @@ public class FormatMessageSink implements MessageSink {
     }
 
     @Override
-    public void handleMessage(final MessageSinkManager despatcher,
+    public void handleMessage(final MessageSinkManager dispatcher,
             final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
-        despatcher.despatchMessage(source, date, patternMatches[0], patternMatches[1], args);
+        dispatcher.dispatchMessage(source, date, patternMatches[0], patternMatches[1], args);
     }
 
 }

src/com/dmdirc/messages/GroupMessageSink.java

@@ -50,7 +50,7 @@ public class GroupMessageSink implements MessageSink {
 
     /** {@inheritDoc} */
     @Override
-    public void handleMessage(final MessageSinkManager despatcher,
+    public void handleMessage(final MessageSinkManager dispatcher,
             final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
@@ -63,7 +63,7 @@ public class GroupMessageSink implements MessageSink {
             target = MessageSinkManager.DEFAULT_SINK;
         }
 
-        despatcher.despatchMessage(source, date, messageType, target, args);
+        dispatcher.dispatchMessage(source, date, messageType, target, args);
     }
 
 }

src/com/dmdirc/messages/LastCommandMessageSink.java

@@ -53,7 +53,7 @@ public class LastCommandMessageSink implements MessageSink {
 
     /** {@inheritDoc} */
     @Override
-    public void handleMessage(final MessageSinkManager despatcher,
+    public void handleMessage(final MessageSinkManager dispatcher,
             final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {

src/com/dmdirc/messages/MessageSink.java

@@ -44,14 +44,14 @@ public interface MessageSink {
     /**
      * Handles a message which has been directed to this sink.
      *
-     * @param despatcher     The manager that is despatching the message
+     * @param dispatcher     The manager that is dispatching the message
      * @param source         The original source of the message
      * @param patternMatches An array of groups matched from this sink's pattern
      * @param date           The date at which the message occurred
      * @param messageType    The type of the message (used for formatting)
      * @param args           The message arguments
      */
-    void handleMessage(final MessageSinkManager despatcher,
+    void handleMessage(final MessageSinkManager dispatcher,
             final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args);

src/com/dmdirc/messages/MessageSinkManager.java

@@ -32,7 +32,7 @@ import java.util.List;
 import java.util.regex.Matcher;
 
 /**
- * Manages message sinks and facilitates despatching of messages to sinks.
+ * Manages message sinks and facilitates dispatching of messages to sinks.
  */
 public class MessageSinkManager {
 
@@ -62,7 +62,7 @@ public class MessageSinkManager {
     }
 
     /**
-     * Despatches a message to the appropriate sink. This method will attempt to select an
+     * Dispatches a message to the appropriate sink. This method will attempt to select an
      * appropriate target sink from the user's configuration.
      *
      * @param source      The source of the message
@@ -70,7 +70,7 @@ public class MessageSinkManager {
      * @param messageType The type (or 'format') of the message
      * @param args        The message arguments
      */
-    public void despatchMessage(final FrameContainer source, final Date date,
+    public void dispatchMessage(final FrameContainer source, final Date date,
             final String messageType, final Object... args) {
         final String target;
         if (source.getConfigManager().hasOptionString(CONFIG_DOMAIN, messageType)) {
@@ -79,11 +79,11 @@ public class MessageSinkManager {
             target = DEFAULT_SINK;
         }
 
-        despatchMessage(source, date, messageType, target, args);
+        dispatchMessage(source, date, messageType, target, args);
     }
 
     /**
-     * Despatches a message to the appropriate sink.
+     * Dispatches a message to the appropriate sink.
      *
      * @param source      The source of the message
      * @param date        The date at which the message occurred
@@ -91,9 +91,8 @@ public class MessageSinkManager {
      * @param targetSink  The textual representation of the destination sink
      * @param args        The message arguments
      */
-    public void despatchMessage(final FrameContainer source,
-            final Date date, final String messageType, final String targetSink,
-            final Object... args) {
+    public void dispatchMessage(final FrameContainer source, final Date date,
+            final String messageType, final String targetSink, final Object... args) {
         for (MessageSink sink : sinks) {
             final Matcher matcher = sink.getPattern().matcher(targetSink);
 
@@ -114,7 +113,7 @@ public class MessageSinkManager {
                 + messageType + ": " + targetSink);
 
         if (!DEFAULT_SINK.equals(targetSink)) {
-            despatchMessage(source, date, messageType, DEFAULT_SINK, args);
+            dispatchMessage(source, date, messageType, DEFAULT_SINK, args);
         }
     }
 

src/com/dmdirc/messages/MessagesModule.java

@@ -56,7 +56,7 @@ public class MessagesModule {
     }
 
     @Provides(type = Provides.Type.SET)
-    public MessageSink getMessageSink(final CommonChanelsMessageSink sink) {
+    public MessageSink getMessageSink(final CommonChannelsMessageSink sink) {
         return sink;
     }
 

src/com/dmdirc/messages/NullMessageSink.java

@@ -49,7 +49,7 @@ public class NullMessageSink implements MessageSink {
 
     /** {@inheritDoc} */
     @Override
-    public void handleMessage(final MessageSinkManager despatcher,
+    public void handleMessage(final MessageSinkManager dispatcher,
             final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {

src/com/dmdirc/messages/SelfMessageSink.java

@@ -49,7 +49,7 @@ public class SelfMessageSink implements MessageSink {
 
     /** {@inheritDoc} */
     @Override
-    public void handleMessage(final MessageSinkManager despatcher,
+    public void handleMessage(final MessageSinkManager dispatcher,
             final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {

src/com/dmdirc/messages/ServerMessageSink.java

@@ -50,7 +50,7 @@ public class ServerMessageSink implements MessageSink {
 
     /** {@inheritDoc} */
     @Override
-    public void handleMessage(final MessageSinkManager despatcher,
+    public void handleMessage(final MessageSinkManager dispatcher,
             final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {

src/com/dmdirc/messages/StatusBarMessageSink.java

@@ -60,7 +60,7 @@ public class StatusBarMessageSink implements MessageSink {
 
     /** {@inheritDoc} */
     @Override
-    public void handleMessage(final MessageSinkManager despatcher,
+    public void handleMessage(final MessageSinkManager dispatcher,
             final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {

src/com/dmdirc/plugins/PluginInfo.java

@@ -368,7 +368,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      */
     public void pluginUpdated() {
         try {
-            // Force a new resourcemanager just incase.
+            // Force a new resourcemanager just in case.
             updateClassList(getResourceManager(true));
 
             updateMetaData();
@@ -635,7 +635,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
             loadClass(metaData.getMainClass());
 
             if (isLoaded()) {
-                //TODO plugin loading shouldnt be done from here, event bus shouldn't be here.
+                //TODO plugin loading shouldn't be done from here, event bus shouldn't be here.
                 eventBus.post(new PluginLoadedEvent(this));
             }
 
@@ -855,7 +855,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
                     eventBus.post(new AppErrorEvent(ErrorLevel.MEDIUM, e, lastError, ""));
                 }
 
-                //TODO plugin unloading shouldnt be done from here, event bus shouldn't be here.
+                //TODO plugin unloading shouldn't be done from here, event bus shouldn't be here.
                 eventBus.post(new PluginUnloadedEvent(this));
                 synchronized (provides) {
                     for (Service service : provides) {

src/com/dmdirc/plugins/implementations/PluginFilesHelper.java

@@ -102,7 +102,7 @@ public class PluginFilesHelper {
      *
      * @throws IOException if the resources failed to extract
      */
-    public void extractResoucesStartingWith(final String prefix) throws IOException {
+    public void extractResourcesStartingWith(final String prefix) throws IOException {
         pluginInfo.getResourceManager().extractResources(prefix, filesDir.toString(), true);
     }
 
@@ -113,7 +113,7 @@ public class PluginFilesHelper {
      *
      * @throws IOException if the resources failed to extract
      */
-    public void extractResoucesEndingWith(final String suffix) throws IOException {
+    public void extractResourcesEndingWith(final String suffix) throws IOException {
         pluginInfo.getResourceManager().extractResoucesEndingWith(filesDir, suffix);
     }
 

src/com/dmdirc/tls/CertificateAction.java

@@ -34,6 +34,6 @@ public enum CertificateAction {
     /** Ignores the problem but does not store the exception. */
     IGNORE_TEMPORARILY,
     /** Adds a permanent exception for the certificate. */
-    IGNORE_PERMANENTY;
+    IGNORE_PERMANENTLY;
 
 }

src/com/dmdirc/tls/CertificateManager.java

@@ -350,7 +350,7 @@ public class CertificateManager implements X509TrustManager {
             switch (action) {
                 case DISCONNECT:
                     throw new CertificateException("Not trusted");
-                case IGNORE_PERMANENTY:
+                case IGNORE_PERMANENTLY:
                     final List<String> list = new ArrayList<>(config
                             .getOptionList("ssl", "trusted"));
                     list.add(Base64.encodeToString(chain[0].getSignature(), false));

src/com/dmdirc/ui/IconManager.java

@@ -153,7 +153,7 @@ public class IconManager implements ConfigChangeListener {
                 ? configManager.getOption("icon", iconType)
                 : "dmdirc://com/dmdirc/res/" + iconType + ".png";
 
-        //Get the url for the speficied path
+        //Get the url for the specified path
         URL imageURL = urlBuilder.getUrl(path);
 
         if (imageURL == null && defaultURL != null) {

src/com/dmdirc/ui/core/aliases/CoreAliasDialogModel.java

@@ -202,7 +202,7 @@ public class CoreAliasDialogModel implements AliasDialogModel {
     }
 
     @Override
-    public int getSelectedAliasMininumArguments() {
+    public int getSelectedAliasMinimumArguments() {
         return minArgs;
     }
 

src/com/dmdirc/updater/components/PluginComponent.java

@@ -106,8 +106,7 @@ public class PluginComponent implements UpdateComponent {
         }
 
         // Try and move the downloaded plugin to the new location.
-        // If it doesn't work then keep the plugin in a .update file untill
-        // the next restart.
+        // If it doesn't work then keep the plugin in a .update file until the next restart.
         // If it does, update the metadata.
         final File newPlugin = new File(path);
         if (!isValid(newPlugin)) {