Lots of typo fixes.

Change-Id: I362e53fc9f05497f48dac4951991b79daebfdb81
Depends-On: Ide5afea6d4e7ba04cf3226f10e1ea530e1a60c10
Depends-On: Ic2a1b97aa44e9168bae4a1e28941208e7711bb46
Reviewed-on: http://gerrit.dmdirc.com/3743
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/ClientModule.java

@@ -230,7 +230,7 @@ public class ClientModule {
         }
 
         // The user may have an existing parser plugin (e.g. twitter) which
-        // will satisfy the service existance check above, but will render the
+        // will satisfy the service existence check above, but will render the
         // client pretty useless, so we'll force IRC extraction for now.
         extractor.extractCorePlugins("parser_irc");
         manager.refreshPlugins();

src/com/dmdirc/CustomWindow.java

@@ -62,7 +62,7 @@ public class CustomWindow extends FrameContainer {
      * @param title          The parent of this custom window
      * @param configProvider The config provider to read settings from.
      * @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.
      */
     public CustomWindow(
             final String name,

src/com/dmdirc/GlobalWindow.java

@@ -55,9 +55,9 @@ public class GlobalWindow extends FrameContainer {
      * @param config              The ConfigManager to retrieve settings from.
      * @param parser              The command parser to use to parse input.
      * @param tabCompleterFactory The factory to use to create tab completers.
-     * @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.
      */
     @Inject
     public GlobalWindow(

src/com/dmdirc/Main.java

@@ -233,7 +233,7 @@ public class Main {
             identityManager.getUserSettings().unsetOption("debug", "uiFixAttempted");
             System.exit(1);
         } else {
-            // Try to extract the UIs again incase they changed between versions
+            // Try to extract the UIs again in case they changed between versions
             // and the user didn't update the UI plugin.
             corePluginExtractor.extractCorePlugins("ui_");
 

src/com/dmdirc/MissingModeAliasException.java

@@ -38,7 +38,7 @@ public class MissingModeAliasException extends Exception {
      * Creates a new exception detailing the missing modes aliases and supporting information.
      *
      * @param network            Network
-     * @param parser             Assocaited parser
+     * @param parser             Associated parser
      * @param modeAliasesVersion Current mode aliases version
      * @param missingModes       Missing modes
      */

src/com/dmdirc/Query.java

@@ -82,7 +82,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
      * @param newServer           The server object that this Query belongs to
      * @param tabCompleterFactory The factory to use to create tab completers.
      * @param commandController   The controller to load commands from.
-     * @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.
      */
     public Query(
@@ -291,7 +291,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
     }
 
     @Override
-    public void onCompositionStateCanged(final Parser parser, final Date date,
+    public void onCompositionStateChanged(final Parser parser, final Date date,
             final CompositionState state, final String host) {
         if (state == CompositionState.TYPING) {
             addComponent(WindowComponent.TYPING_INDICATOR.getIdentifier());

src/com/dmdirc/Raw.java

@@ -54,7 +54,7 @@ public class Raw extends FrameContainer implements DataInListener, DataOutListen
      *
      * @param newServer          the server to monitor
      * @param commandController  The controller to load commands from.
-     * @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.
      */
     public Raw(

src/com/dmdirc/Server.java

@@ -195,14 +195,14 @@ public class Server extends FrameContainer implements ConfigChangeListener,
      * @param parserFactory         The factory to use to generate parsers.
      * @param tabCompleterFactory   The factory to use for tab completers.
      * @param identityFactory       The factory to use to create identities.
-     * @param messageSinkManager    The sink manager to use to despatch messages.
+     * @param messageSinkManager    The sink manager to use to dispatch messages.
      * @param statusBarManager      The manager to use to add status bar messages.
      * @param windowManager         Window Manager
      * @param channelFactory        The factory to use to create channels.
      * @param queryFactory          The factory to use to create queries.
      * @param rawFactory            The factory to use to create raw windows.
      * @param urlBuilder            The URL builder to use when finding icons.
-     * @param eventBus              The event bus to despatch events onto.
+     * @param eventBus              The event bus to dispatch events onto.
      * @param messageEncoderFactory The message encoder factory to create a message encoder with.
      * @param userSettings          The config provider to write user settings to.
      * @param executorService       The service to use to schedule events.
@@ -456,7 +456,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
     }
 
     /**
-     * Schedules a reconnect attempt to be performed after a user-defiend delay.
+     * Schedules a reconnect attempt to be performed after a user-defined delay.
      */
     @Precondition("The server state is transiently disconnected")
     private void doDelayedReconnect() {
@@ -1003,7 +1003,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
             getConfigManager().removeListener(this);
             executorService.shutdown();
 
-            // Trigger any actions neccessary
+            // Trigger any actions necessary
             disconnect();
 
             myState.transition(ServerState.CLOSING);

src/com/dmdirc/ServerManager.java

@@ -255,7 +255,7 @@ public class ServerManager implements ServerFactory {
     }
 
     /**
-     * Connects the user to Quakenet if neccessary and joins #DMDirc.
+     * Connects the user to Quakenet if necessary and joins #DMDirc.
      */
     public void joinDevChat() {
         final List<Server> qnetServers = getServersByNetwork("Quakenet");

src/com/dmdirc/ServerStatus.java

@@ -93,7 +93,7 @@ public class ServerStatus {
     /**
      * Adds a history entry to this status object. The history entry contains the name of the states
      * being transitioned between, the details of the method (and class and line) which initiated
-     * the transition, and the name of the thread in which the transition is occuring.
+     * the transition, and the name of the thread in which the transition is occurring.
      *
      * @param fromState The state which is being transitioned from
      * @param toState   The state which is being transitioned to

src/com/dmdirc/actions/ActionSubstitutor.java

@@ -154,7 +154,7 @@ public class ActionSubstitutor {
     }
 
     /**
-     * Returns true if this action type's first argument is a frame container, or descendent of one.
+     * Returns true if this action type's first argument is a frame container, or descendant of one.
      *
      * @return True if this action type's first arg extends or is a FrameContainer
      */

src/com/dmdirc/actions/ConditionTree.java

@@ -344,9 +344,9 @@ public final class ConditionTree {
     }
 
     /**
-     * Creates a condition tree by disjoining the specified number of arguments together.
+     * Creates a condition tree by disjointing the specified number of arguments together.
      *
-     * @param numArgs The number of arguments to be disjoined
+     * @param numArgs The number of arguments to be disjointed
      *
      * @return The corresponding condition tree
      */

src/com/dmdirc/actions/ConditionTreeFactory.java

@@ -96,7 +96,7 @@ public abstract class ConditionTreeFactory {
     }
 
     /**
-     * Creates condition trees where the arguments are disjoined together.
+     * Creates condition trees where the arguments are disjointed together.
      */
     public static class DisjunctionFactory extends ConditionTreeFactory {
 

src/com/dmdirc/commandparser/aliases/AliasesModule.java

@@ -49,7 +49,7 @@ public class AliasesModule {
     }
 
     @Provides(type = Provides.Type.SET)
-    public SystemLifecycleComponent getLifeycleComponent(final AliasLifecycleManager manager) {
+    public SystemLifecycleComponent getLifecycleComponent(final AliasLifecycleManager manager) {
         return manager;
     }
 

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

@@ -56,7 +56,7 @@ public class Ifplugin extends Command implements IntelligentCommand {
     private final PluginManager pluginManager;
     /** Provider of global command parsers. */
     private final Provider<GlobalCommandParser> globalCommandParserProvider;
-    /** Proivder of global windows. */
+    /** Provider of global windows. */
     private final Provider<GlobalWindow> globalWindowProvider;
 
     /**

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

@@ -57,7 +57,7 @@ public class OpenWindow extends Command implements IntelligentCommand {
     private final WindowManager windowManager;
     /** The URL builder to use when finding icons. */
     private final URLBuilder urlBuilder;
-    /** The bus to despatch events on. */
+    /** The bus to dispatch events on. */
     private final EventBus eventBus;
     /** The config provider to retrieve settings from. */
     private final AggregateConfigProvider configProvider;
@@ -68,7 +68,7 @@ public class OpenWindow extends Command implements IntelligentCommand {
      * @param controller     The controller to use for command information.
      * @param windowManager  Window management
      * @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 configProvider The config provider to retrieve settings from.
      */
     @Inject

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

@@ -75,7 +75,7 @@ public class Message extends Command implements IntelligentCommand,
             sendLine(origin, args.isSilent(), "selfMessage", target, message);
 
             // If this is a known server or channel, and this is not a silent
-            // invokation, use sendLine, else send it raw to the parser.
+            // invocation, use sendLine, else send it raw to the parser.
             if (!args.isSilent() && server.hasChannel(target)) {
                 server.getChannel(target).sendLine(message);
             } else if (!args.isSilent() && server.hasQuery(target)) {

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

@@ -21,6 +21,6 @@
  */
 
 /**
- * Command parser, proceses and handles commands for the client.
+ * Command parser, processes and handles commands for the client.
  */
 package com.dmdirc.commandparser;

src/com/dmdirc/config/CipherUtils.java

@@ -60,7 +60,7 @@ public abstract class CipherUtils {
         (byte) 0x56, (byte) 0x35, (byte) 0xE3, (byte) 0x03,};
     /** Iteration count. */
     private static final int ITERATIONS = 19;
-    /** Number of auth attemps before failing the attempt. */
+    /** Number of auth attempts before failing the attempt. */
     private static final int AUTH_TRIES = 4;
     /** The identity controller to use for reading/writing settings. */
     private final IdentityController identityController;

src/com/dmdirc/config/ConfigManager.java

@@ -285,7 +285,7 @@ class ConfigManager extends BaseConfigProvider implements ConfigChangeListener,
     /**
      * Determines whether the specified identity target matches the desired target. If the desired
      * target is prefixed with "re:", it is treated as a regular expression; otherwise the strings
-     * are compared lexigraphically to determine a match.
+     * are compared lexicographically to determine a match.
      *
      * @param desired The target string required by this config manager
      * @param actual  The target string supplied by the identity

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

@@ -24,7 +24,7 @@
  * Deals with client configuration and preferences.
  *
  * DMDirc's configuration system is based upon a set of 'identities'. Each identity has a specific
- * target which controls which elements of the client it is applied to. Identities can be targetted
+ * target which controls which elements of the client it is applied to. Identities can be targeted
  * to the client as a whole, and individual networks, servers or channels. Identities may also
  * specify an order, which controls in which order they are checked when looking up a configuration
  * setting.

src/com/dmdirc/config/prefs/PreferencesCategory.java

@@ -196,7 +196,7 @@ public class PreferencesCategory {
     /**
      * Adds the specified subcategory to this category.
      *
-     * @param subcategory The category to be asdded
+     * @param subcategory The category to be added
      */
     public void addSubCategory(final PreferencesCategory subcategory) {
         if (isInline() && !subcategory.isInline()) {

src/com/dmdirc/interfaces/Connection.java

@@ -229,7 +229,7 @@ public interface Connection {
     IgnoreList getIgnoreList();
 
     /**
-     * Retusnt the list of invites for this server.
+     * Returns the list of invites for this server.
      *
      * @return Invite list
      */

src/com/dmdirc/lists/GroupListManager.java

@@ -100,7 +100,7 @@ public class GroupListManager implements GroupListStartListener,
     }
 
     /**
-     * Adds an observer to this mananger.
+     * Adds an observer to this manager.
      *
      * @param observer The observer to be notified of group start/stop events.
      */

src/com/dmdirc/logger/ErrorManager.java

@@ -82,7 +82,7 @@ public class ErrorManager implements ConfigChangeListener {
     }
 
     /**
-     * Initialiases the error manager.
+     * Initialises the error manager.
      *
      * @param globalConfig The configuration to read settings from.
      * @param directory    The directory to store errors in, if enabled.

src/com/dmdirc/logger/ProgramError.java

@@ -327,7 +327,7 @@ public final class ProgramError implements Serializable {
     }
 
     /**
-     * Retruns a human readable string describing the number of times this error occurred and when
+     * Returns a human readable string describing the number of times this error occurred and when
      * these occurrences were.
      *
      * @return Occurrences description

src/com/dmdirc/messages/ChannelMessageSink.java

@@ -33,7 +33,7 @@ import javax.inject.Inject;
 /**
  * A message sink which adds the message to a named channel. An optional fallback may be specified
  * for use if the channel does not exist. If no fallback is specified and the channel does not
- * exist, the message is despatched to the source.
+ * exist, the message is dispatched to the source.
  */
 public class ChannelMessageSink implements MessageSink {
 

src/com/dmdirc/messages/CommonChannelsMessageSink.java

@@ -34,7 +34,7 @@ import javax.inject.Inject;
  * A message sink which adds the message to all channels the local user has in common with a
  * specified remote user. An optional fallback may be specified for use if there are no common
  * channels with the user. If no fallback is specified and there are no common channels, the message
- * is despatched to the source.
+ * is dispatched to the source.
  */
 public class CommonChannelsMessageSink implements MessageSink {
 

src/com/dmdirc/messages/FormatMessageSink.java

@@ -30,7 +30,7 @@ import java.util.regex.Pattern;
 import javax.inject.Inject;
 
 /**
- * A message sink which changes the format of the message and then redespatches it.
+ * A message sink which changes the format of the message and then re-dispatches it.
  */
 public class FormatMessageSink implements MessageSink {
 

src/com/dmdirc/messages/SelfMessageSink.java

@@ -30,7 +30,7 @@ import java.util.regex.Pattern;
 import javax.inject.Inject;
 
 /**
- * A message sink which adds the message to the container that despatched it.
+ * A message sink which adds the message to the container that dispatched it.
  */
 public class SelfMessageSink implements MessageSink {
 

src/com/dmdirc/plugins/ExportedService.java

@@ -71,7 +71,7 @@ public class ExportedService {
             }
         }
 
-        throw new IllegalArgumentException("Illegal method/class combinatiion",
+        throw new IllegalArgumentException("Illegal method/class combination",
                 new NoSuchMethodException("Method does not exist in the specified class"));
     }
 

src/com/dmdirc/plugins/Plugin.java

@@ -36,7 +36,7 @@ public interface Plugin {
      * Check any further Prerequisites for this plugin to load that can not be checked using
      * metainfo.
      *
-     * @return ValidationResponse detailign if the plugin passes any extra checks that plugin.info
+     * @return ValidationResponse detailing if the plugin passes any extra checks that plugin.info
      *         can't handle
      */
     ValidationResponse checkPrerequisites();

src/com/dmdirc/plugins/PluginClassLoader.java

@@ -83,7 +83,7 @@ public class PluginClassLoader extends ClassLoader {
      * Have we already loaded the given class name?
      *
      * @param name        Name to check.
-     * @param checkGlobal Should we check if the GCL has loaded it aswell?
+     * @param checkGlobal Should we check if the GCL has loaded it as well?
      *
      * @return True if the specified class is loaded, false otherwise
      */
@@ -96,7 +96,7 @@ public class PluginClassLoader extends ClassLoader {
      * Load the plugin with the given className.
      *
      * @param name      Class Name of plugin
-     * @param askGlobal Ask the gobal class loaded for this class if we can't find it?
+     * @param askGlobal Ask the global class loaded for this class if we can't find it?
      *
      * @return plugin class
      *

src/com/dmdirc/plugins/ServiceManager.java

@@ -54,7 +54,7 @@ public interface ServiceManager {
      * @param type Type of this service
      * @param name Name of this service
      *
-     * @return The service requested, or null if service wasn't found and create wasn't specifed
+     * @return The service requested, or null if service wasn't found and create wasn't specified
      */
     Service getService(final String type, final String name);
 
@@ -65,7 +65,7 @@ public interface ServiceManager {
      * @param name   Name of this service
      * @param create If the requested service doesn't exist, should it be created?
      *
-     * @return The service requested, or null if service wasn't found and create wasn't specifed
+     * @return The service requested, or null if service wasn't found and create wasn't specified
      */
     Service getService(final String type, final String name, final boolean create);
 
@@ -99,7 +99,7 @@ public interface ServiceManager {
             final boolean fallback) throws NoSuchProviderException;
 
     /**
-     * Get a List of all services of a specifed type.
+     * Get a List of all services of a specified type.
      *
      * @param type Type of service
      *

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

@@ -114,7 +114,7 @@ public class PluginFilesHelper {
      * @throws IOException if the resources failed to extract
      */
     public void extractResourcesEndingWith(final String suffix) throws IOException {
-        pluginInfo.getResourceManager().extractResoucesEndingWith(filesDir, suffix);
+        pluginInfo.getResourceManager().extractResourcesEndingWith(filesDir, suffix);
     }
 
 }

src/com/dmdirc/ui/CoreUIUtils.java

@@ -34,7 +34,7 @@ import java.awt.Window;
  */
 public final class CoreUIUtils {
 
-    /** Precent creation. */
+    /** Prevent creation. */
     private CoreUIUtils() {
     }
 

src/com/dmdirc/ui/FatalErrorDialog.java

@@ -53,7 +53,7 @@ import javax.swing.text.StyleConstants;
 import javax.swing.text.StyledDocument;
 
 /**
- * The fatal error dialog is used to inform the user that a fatal error has occured and to give them
+ * The fatal error dialog is used to inform the user that a fatal error has occurred and to give them
  * a chance to quit or restart the client.
  */
 public final class FatalErrorDialog extends JDialog implements ActionListener,
@@ -69,7 +69,7 @@ public final class FatalErrorDialog extends JDialog implements ActionListener,
     private JButton restartButton;
     /** Quit client button. */
     private JButton quitButton;
-    /** Send errorbButton. */
+    /** Send error button. */
     private JButton sendButton;
     /** Info panel, informs the user what is happening. */
     private JTextPane infoLabel;

src/com/dmdirc/ui/StatusMessage.java

@@ -32,7 +32,7 @@ public class StatusMessage {
 
     /** Icon type for the message. */
     private final String iconType;
-    /** Mesage to display. */
+    /** Message to display. */
     private final String message;
     /** Message notifier. */
     private final StatusMessageNotifier messageNotifier;

src/com/dmdirc/ui/WindowManager.java

@@ -208,7 +208,7 @@ public class WindowManager {
      * @since 0.6.4
      * @param target The container to be tested
      *
-     * @return True if the target is in the hierarchy, false otherise
+     * @return True if the target is in the hierarchy, false otherwise
      */
     protected boolean isInHierarchy(final FrameContainer target) {
         if (rootWindows.contains(target)) {

src/com/dmdirc/ui/core/dialogs/sslcertificate/SSLCertificateDialogModel.java

@@ -195,7 +195,7 @@ public class SSLCertificateDialogModel {
     /**
      * Adds a field to the specified group.
      *
-     * @param fields  The fields extracted from the certiciate
+     * @param fields  The fields extracted from the certificate
      * @param group   The group to add an entry to
      * @param title   The user-friendly title of the field
      * @param field   The name of the field to look for

src/com/dmdirc/ui/input/InputHandler.java

@@ -110,7 +110,7 @@ public abstract class InputHandler implements ConfigChangeListener {
     private final ServiceManager serviceManager;
     /** The controller to use to retrieve command information. */
     private final CommandController commandController;
-    /** The event bus to use to despatch input events. */
+    /** The event bus to use to dispatch input events. */
     private final EventBus eventBus;
 
     /**
@@ -121,7 +121,7 @@ public abstract class InputHandler implements ConfigChangeListener {
      * @param commandController The controller to use to retrieve command information.
      * @param commandParser     The command parser to use for this text field.
      * @param parentWindow      The window that owns this input handler
-     * @param eventBus          The event bus to use to despatch input events.
+     * @param eventBus          The event bus to use to dispatch input events.
      */
     public InputHandler(
             final ServiceManager serviceManager,

src/com/dmdirc/ui/messages/IRCDocument.java

@@ -229,13 +229,13 @@ public class IRCDocument implements Serializable, ConfigChangeListener {
     /**
      * Fires the trimmed method on all listeners.
      *
-     * @param newSize     New document size
-     * @param trimedLines Number of trimmed lines
+     * @param newSize      New document size
+     * @param trimmedLines Number of trimmed lines
      */
-    protected void fireTrimmed(final int newSize, final int trimedLines) {
+    protected void fireTrimmed(final int newSize, final int trimmedLines) {
         for (IRCDocumentListener listener
                 : listeners.get(IRCDocumentListener.class)) {
-            listener.trimmed(newSize, trimedLines);
+            listener.trimmed(newSize, trimmedLines);
         }
     }
 

src/com/dmdirc/ui/messages/Styliser.java

@@ -241,7 +241,7 @@ public class Styliser implements ConfigChangeListener {
      * <p>
      * The index translation is left-biased; that is, the indices are translated to be as far left
      * as they possibly can be. This means that the start of the string will include any control
-     * codes immediately preceeding the desired text, and the end will not include any trailing
+     * codes immediately preceding the desired text, and the end will not include any trailing
      * codes.
      * <p>
      * This method will NOT include "internal" control codes in the output.

src/com/dmdirc/updater/UpdateComponent.java

@@ -99,7 +99,7 @@ public interface UpdateComponent {
      *
      * @return True if a client restart is needed, false otherwise
      *
-     * @throws java.lang.Exception If any error occured
+     * @throws java.lang.Exception If any error occurred
      */
     boolean doInstall(String path) throws Exception; //NOPMD
 

src/com/dmdirc/updater/UpdaterModule.java

@@ -40,7 +40,7 @@ import com.dmdirc.updater.manager.DMDircUpdateManager;
 import com.dmdirc.updater.manager.UpdateComponentPolicy;
 import com.dmdirc.updater.manager.UpdateManager;
 import com.dmdirc.updater.retrieving.DownloadRetrievalStrategy;
-import com.dmdirc.updater.retrieving.UpdateRetrievalStategy;
+import com.dmdirc.updater.retrieving.UpdateRetrievalStrategy;
 
 import com.google.common.eventbus.EventBus;
 
@@ -156,14 +156,14 @@ public class UpdaterModule {
     }
 
     /**
-     * Provides an {@link UpdateRetrievalStategy} that the client should use.
+     * Provides an {@link UpdateRetrievalStrategy} that the client should use.
      *
      * @param strategy The strategy to provide.
      *
      * @return The strategy to use in the client.
      */
     @Provides(type = Provides.Type.SET)
-    public UpdateRetrievalStategy getRetrievalStrategy(final DownloadRetrievalStrategy strategy) {
+    public UpdateRetrievalStrategy getRetrievalStrategy(final DownloadRetrievalStrategy strategy) {
         return strategy;
     }
 

src/com/dmdirc/updater/installing/UpdateInstallationStrategy.java

@@ -26,7 +26,7 @@ import com.dmdirc.updater.retrieving.UpdateRetrievalResult;
 
 /**
  * Describes a strategy for installing updates which have been retrieved by a
- * {@link com.dmdirc.updater.retrieving.UpdateRetrievalStategy}.
+ * {@link com.dmdirc.updater.retrieving.UpdateRetrievalStrategy}.
  */
 public interface UpdateInstallationStrategy {
 

src/com/dmdirc/updater/manager/DMDircUpdateManager.java

@@ -26,7 +26,7 @@ import com.dmdirc.updater.UpdateComponent;
 import com.dmdirc.updater.checking.CheckResultConsolidator;
 import com.dmdirc.updater.checking.UpdateCheckStrategy;
 import com.dmdirc.updater.installing.UpdateInstallationStrategy;
-import com.dmdirc.updater.retrieving.UpdateRetrievalStategy;
+import com.dmdirc.updater.retrieving.UpdateRetrievalStrategy;
 
 import java.util.Set;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -53,7 +53,7 @@ public class DMDircUpdateManager extends CachingUpdateManagerImpl {
      * @param checkStrategies        The strategies to use to actually perform checks.
      * @param consolidator           The consolidator to use to pick from multiple available
      *                               updates.
-     * @param retrievalStategies     The strategies to use to retrieve updates.
+     * @param retrievalStrategies     The strategies to use to retrieve updates.
      * @param installationStrategies The strategies to use to install updates.
      * @param components             The default components to add to the manager.
      */
@@ -62,7 +62,7 @@ public class DMDircUpdateManager extends CachingUpdateManagerImpl {
             final UpdateComponentPolicy updatePolicy,
             final Set<UpdateCheckStrategy> checkStrategies,
             final CheckResultConsolidator consolidator,
-            final Set<UpdateRetrievalStategy> retrievalStategies,
+            final Set<UpdateRetrievalStrategy> retrievalStrategies,
             final Set<UpdateInstallationStrategy> installationStrategies,
             final Set<UpdateComponent> components) {
         super(new ThreadPoolExecutor(THREAD_COUNT, THREAD_COUNT, 1, TimeUnit.MINUTES,
@@ -73,8 +73,8 @@ public class DMDircUpdateManager extends CachingUpdateManagerImpl {
             addCheckStrategy(checkStrategy);
         }
 
-        for (UpdateRetrievalStategy retrievalStategy : retrievalStategies) {
-            addRetrievalStrategy(retrievalStategy);
+        for (UpdateRetrievalStrategy retrievalStrategy : retrievalStrategies) {
+            addRetrievalStrategy(retrievalStrategy);
         }
 
         for (UpdateInstallationStrategy installationStrategy : installationStrategies) {

src/com/dmdirc/updater/manager/RetrievalTask.java

@@ -24,10 +24,10 @@ package com.dmdirc.updater.manager;
 
 import com.dmdirc.updater.checking.UpdateCheckResult;
 import com.dmdirc.updater.retrieving.UpdateRetrievalResult;
-import com.dmdirc.updater.retrieving.UpdateRetrievalStategy;
+import com.dmdirc.updater.retrieving.UpdateRetrievalStrategy;
 
 /**
- * Task which retrieves an available update using the given {@link UpdateRetrievalStategy} and
+ * Task which retrieves an available update using the given {@link UpdateRetrievalStrategy} and
  * passes the result back to the {@link UpdateManagerImpl}.
  */
 public class RetrievalTask implements Runnable {
@@ -35,13 +35,13 @@ public class RetrievalTask implements Runnable {
     /** The update manager launching this task. */
     private final UpdateManagerImpl manager;
     /** The strategy to use to retrieve the update. */
-    private final UpdateRetrievalStategy strategy;
+    private final UpdateRetrievalStrategy strategy;
     /** The update which will be downloaded. */
     private final UpdateCheckResult result;
     /** Whether to install afterwards or not. */
     private final boolean install;
 
-    public RetrievalTask(final UpdateManagerImpl manager, final UpdateRetrievalStategy strategy,
+    public RetrievalTask(final UpdateManagerImpl manager, final UpdateRetrievalStrategy strategy,
             final UpdateCheckResult result, final boolean install) {
         this.manager = manager;
         this.strategy = strategy;

src/com/dmdirc/updater/manager/UpdateManager.java

@@ -26,7 +26,7 @@ import com.dmdirc.updater.UpdateComponent;
 import com.dmdirc.updater.checking.UpdateCheckResult;
 import com.dmdirc.updater.checking.UpdateCheckStrategy;
 import com.dmdirc.updater.installing.UpdateInstallationStrategy;
-import com.dmdirc.updater.retrieving.UpdateRetrievalStategy;
+import com.dmdirc.updater.retrieving.UpdateRetrievalStrategy;
 
 import java.util.Collection;
 
@@ -54,13 +54,13 @@ public interface UpdateManager {
     void addInstallationStrategy(final UpdateInstallationStrategy strategy);
 
     /**
-     * Adds a new retrieval strategy to this manager. {@link UpdateRetrievalStategy}s are
+     * Adds a new retrieval strategy to this manager. {@link UpdateRetrievalStrategy}s are
      * responsible for retrieving the updated version of a component after an update has been
      * identified by a {@link UpdateCheckStrategy}.
      *
      * @param strategy The strategy to be added.
      */
-    void addRetrievalStrategy(final UpdateRetrievalStategy strategy);
+    void addRetrievalStrategy(final UpdateRetrievalStrategy strategy);
 
     /**
      * Adds a new component to this manager. Components will be checked for updates the next time

src/com/dmdirc/updater/manager/UpdateManagerImpl.java

@@ -30,7 +30,7 @@ import com.dmdirc.updater.installing.UpdateInstallationListener;
 import com.dmdirc.updater.installing.UpdateInstallationStrategy;
 import com.dmdirc.updater.retrieving.UpdateRetrievalListener;
 import com.dmdirc.updater.retrieving.UpdateRetrievalResult;
-import com.dmdirc.updater.retrieving.UpdateRetrievalStategy;
+import com.dmdirc.updater.retrieving.UpdateRetrievalStrategy;
 import com.dmdirc.util.collections.ListenerList;
 
 import java.util.ArrayList;
@@ -53,7 +53,7 @@ public class UpdateManagerImpl implements UpdateManager {
     /** Collection of known update checking strategies. */
     private final List<UpdateCheckStrategy> checkers = new CopyOnWriteArrayList<>();
     /** Collection of known update retrieval strategies. */
-    private final List<UpdateRetrievalStategy> retrievers = new CopyOnWriteArrayList<>();
+    private final List<UpdateRetrievalStrategy> retrievers = new CopyOnWriteArrayList<>();
     /** Collection of known update installation strategies. */
     private final List<UpdateInstallationStrategy> installers = new CopyOnWriteArrayList<>();
     /** Map of known component names to their components. Guarded by {@link #componentsLock}. */
@@ -101,7 +101,7 @@ public class UpdateManagerImpl implements UpdateManager {
 
     /** {@inheritDoc} */
     @Override
-    public void addRetrievalStrategy(final UpdateRetrievalStategy strategy) {
+    public void addRetrievalStrategy(final UpdateRetrievalStrategy strategy) {
         log.trace("Adding new retrieval strategy: {}", strategy);
         strategy.addUpdateRetrievalListener(retrievalListener);
         this.retrievers.add(strategy);
@@ -247,7 +247,7 @@ public class UpdateManagerImpl implements UpdateManager {
         }
 
         final UpdateCheckResult update = checkResults.get(component);
-        final UpdateRetrievalStategy strategy = getStrategy(update);
+        final UpdateRetrievalStrategy strategy = getStrategy(update);
 
         if (strategy == null) {
             listenerList.getCallable(UpdateStatusListener.class)
@@ -263,7 +263,7 @@ public class UpdateManagerImpl implements UpdateManager {
     /**
      * Sets the retrieval result for an {@link UpdateComponent}.
      *
-     * @param result The result retrieved from the {@link UpdateRetrievalStategy}.
+     * @param result The result retrieved from the {@link UpdateRetrievalStrategy}.
      */
     protected void setRetrievalResult(final UpdateRetrievalResult result) {
         log.debug("Received retrieval result {}", result);
@@ -278,10 +278,10 @@ public class UpdateManagerImpl implements UpdateManager {
      *
      * @return A relevant strategy, or <code>null</code> if none are available
      */
-    protected UpdateRetrievalStategy getStrategy(final UpdateCheckResult result) {
+    protected UpdateRetrievalStrategy getStrategy(final UpdateCheckResult result) {
         log.debug("Trying to find retrieval strategy for {}", result);
 
-        for (UpdateRetrievalStategy strategy : retrievers) {
+        for (UpdateRetrievalStrategy strategy : retrievers) {
             log.trace("Testing strategy {}", strategy);
 
             if (strategy.canHandle(result)) {

src/com/dmdirc/updater/retrieving/DownloadRetrievalStrategy.java

@@ -38,7 +38,7 @@ import javax.inject.Inject;
 import org.slf4j.LoggerFactory;
 
 /**
- * An {@link UpdateRetrievalStategy} that downloads a file specified in a
+ * An {@link UpdateRetrievalStrategy} that downloads a file specified in a
  * {@link DownloadableUpdate}.
  */
 public class DownloadRetrievalStrategy extends TypeSensitiveRetrievalStrategy<DownloadableUpdate> {

src/com/dmdirc/updater/retrieving/TypeSensitiveRetrievalStrategy.java

@@ -25,13 +25,13 @@ package com.dmdirc.updater.retrieving;
 import com.dmdirc.updater.checking.UpdateCheckResult;
 
 /**
- * Base class for {@link UpdateRetrievalStategy} implementations that can handle a single subclass
+ * Base class for {@link UpdateRetrievalStrategy} implementations that can handle a single subclass
  * of {@link UpdateCheckResult}.
  *
  * @param <T> The type of result that this strategy can handle
  */
 public abstract class TypeSensitiveRetrievalStrategy<T extends UpdateCheckResult>
-        implements UpdateRetrievalStategy {
+        implements UpdateRetrievalStrategy {
 
     /** The type of result that this strategy can handle. */
     private final Class<T> clazz;

src/com/dmdirc/updater/retrieving/UpdateRetrievalListener.java

@@ -26,7 +26,7 @@ import com.dmdirc.updater.UpdateComponent;
 
 /**
  * Interface for objects interested in the progress of a retrieval attempt performed by an
- * {@link UpdateRetrievalStategy}.
+ * {@link UpdateRetrievalStrategy}.
  */
 public interface UpdateRetrievalListener {
 

src/com/dmdirc/updater/retrieving/UpdateRetrievalResult.java

@@ -25,7 +25,7 @@ package com.dmdirc.updater.retrieving;
 import com.dmdirc.updater.checking.UpdateCheckResult;
 
 /**
- * Describes the result of a retrieval operation by an {@link UpdateRetrievalStategy}.
+ * Describes the result of a retrieval operation by an {@link UpdateRetrievalStrategy}.
  */
 public interface UpdateRetrievalResult {
 

src/com/dmdirc/updater/retrieving/UpdateRetrievalStategy.java → src/com/dmdirc/updater/retrieving/UpdateRetrievalStrategy.java

@@ -30,7 +30,7 @@ import com.dmdirc.updater.checking.UpdateCheckResult;
  * in a temporary location on disk for use by an
  * {@link com.dmdirc.updater.installing.UpdateInstallationStrategy}.
  */
-public interface UpdateRetrievalStategy {
+public interface UpdateRetrievalStrategy {
 
     /**
      * Determines whether this strategy can handle retrieving the given update.

src/com/dmdirc/util/URIParser.java

@@ -44,7 +44,7 @@ public class URIParser {
     /**
      * Pattern used to breakdown a URI. From RFC3986 appendix-B.
      */
-    private final Pattern uriBreadown = Pattern.compile(
+    private final Pattern uriBreakdown = Pattern.compile(
             "((?<scheme>[^:/?#]+):)?(//(?<authority>[^/?#]*))?(?<path>[^?#]*)(\\?(?<query>[^#]*))?(#(?<fragment>.*))?");
 
     /**
@@ -74,7 +74,7 @@ public class URIParser {
         final String path;
         final String query;
         final String fragment;
-        final Matcher uriMatcher = uriBreadown.matcher(input);
+        final Matcher uriMatcher = uriBreakdown.matcher(input);
         if (!uriMatcher.matches() || uriMatcher.group("scheme") == null || uriMatcher.group(
                 "authority") == null) {
             throw new InvalidURIException("Invalid address specified");

src/com/dmdirc/util/YamlReaderUtils.java

@@ -36,7 +36,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 public final class YamlReaderUtils {
 
     private YamlReaderUtils() {
-        // Shouldn't be instansiated
+        // Shouldn't be instantiated
     }
 
     /**

src/com/dmdirc/util/resourcemanager/FileResourceManager.java

@@ -212,7 +212,7 @@ public final class FileResourceManager extends ResourceManager {
     }
 
     /**
-     * Returns a resursive listing of a directory tree.
+     * Returns a recursive listing of a directory tree.
      *
      * @param startingDirectory Starting directory for the file listing
      *

src/com/dmdirc/util/resourcemanager/ResourceManager.java

@@ -205,8 +205,8 @@ public abstract class ResourceManager {
      *
      * @throws IOException if the resources failed to extract
      */
-    public final void extractResoucesEndingWith(final File newDir,
-            final String suffix) throws IOException {
+    public final void extractResourcesEndingWith(final File newDir, final String suffix)
+            throws IOException {
         final Map<String, byte[]> resources = getResourcesEndingWithAsBytes(
                 suffix);
         for (Entry<String, byte[]> resource : resources.entrySet()) {