Merge pull request #719 from csmith/master

Use new config annotations.

src/main/java/com/dmdirc/ClientModule.java

@@ -31,6 +31,7 @@ import com.dmdirc.commandparser.aliases.AliasesModule;
 import com.dmdirc.commandparser.auto.AutoCommandModule;
 import com.dmdirc.commandparser.commands.CommandModule;
 import com.dmdirc.config.ConfigModule;
+import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.config.profiles.ProfilesModule;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.ConnectionFactory;
@@ -47,18 +48,14 @@ import com.dmdirc.ui.themes.ThemeManager;
 import com.dmdirc.updater.UpdaterModule;
 import com.dmdirc.util.LoggingExecutorService;
 import com.dmdirc.util.io.Downloader;
-
+import dagger.Module;
+import dagger.ObjectGraph;
+import dagger.Provides;
 import java.util.concurrent.ExecutorService;
-
 import javax.inject.Named;
 import javax.inject.Provider;
-import javax.inject.Qualifier;
 import javax.inject.Singleton;
 
-import dagger.Module;
-import dagger.ObjectGraph;
-import dagger.Provides;
-
 /**
  * Provides dependencies for the client.
  */
@@ -79,21 +76,6 @@ import dagger.Provides;
         library = true)
 public class ClientModule {
 
-    /** Qualifier that identities a global configuration source. */
-    @Qualifier
-    public @interface GlobalConfig {
-    }
-
-    /** Qualifier that identities the user settings config provider. */
-    @Qualifier
-    public @interface UserConfig {
-    }
-
-    /** Qualifier that identities the addon defaults config provider. */
-    @Qualifier
-    public @interface AddonConfig {
-    }
-
     /** The object graph to inject where necessary. */
     private ObjectGraph objectGraph;
 
@@ -149,15 +131,8 @@ public class ClientModule {
     @Provides
     @Singleton
     @GlobalConfig
-    public ColourManager getOldGlobalColourManager(@com.dmdirc.config.GlobalConfig final ColourManager colourManager) {
-        return colourManager;
-    }
-
-    @Provides
-    @Singleton
-    @com.dmdirc.config.GlobalConfig
     public ColourManager getGlobalColourManager(final ColourManagerFactory colourManagerFactory,
-            @com.dmdirc.config.GlobalConfig final AggregateConfigProvider globalConfig) {
+            @GlobalConfig final AggregateConfigProvider globalConfig) {
         return colourManagerFactory.getColourManager(globalConfig);
     }
 

src/main/java/com/dmdirc/GlobalWindow.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc;
 
-import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
+import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.EventBus;

src/main/java/com/dmdirc/ServerFactoryImpl.java

@@ -24,6 +24,7 @@ package com.dmdirc;
 
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.ServerCommandParser;
+import com.dmdirc.config.UserConfig;
 import com.dmdirc.config.profiles.Profile;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.EventBus;
@@ -69,7 +70,7 @@ public class ServerFactoryImpl {
             final Provider<CommandController> commandController,
             final EventBus eventBus,
             final MessageEncoderFactory messageEncoderFactory,
-            @ClientModule.UserConfig final ConfigProvider userSettings,
+            @UserConfig final ConfigProvider userSettings,
             final BackBufferFactory backBufferFactory,
             final GroupChatManagerImplFactory groupChatManagerFactory,
             final UserManager userManager) {

src/main/java/com/dmdirc/SystemLifecycleController.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc;
 
-import com.dmdirc.ClientModule.GlobalConfig;
+import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.events.ClientClosedEvent;
 import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.EventBus;

src/main/java/com/dmdirc/commandline/CommandLineParser.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.commandline;
 
-import com.dmdirc.ClientModule.GlobalConfig;
+import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.util.InvalidURIException;

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.commands.global;
 
-import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.CustomWindow;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
@@ -31,6 +30,7 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.EventBus;
@@ -40,10 +40,9 @@ import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.messages.BackBufferFactory;
 
-import java.util.Optional;
-
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
+import java.util.Optional;
 
 /**
  * Opens a new window.

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

@@ -22,22 +22,20 @@
 
 package com.dmdirc.commandparser.parsers;
 
-import com.dmdirc.ClientModule;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -62,7 +60,7 @@ public class GlobalCommandParser extends CommandParser {
      */
     @Inject
     public GlobalCommandParser(
-            @ClientModule.GlobalConfig final AggregateConfigProvider configManager,
+            @GlobalConfig final AggregateConfigProvider configManager,
             final CommandController commandManager,
             final EventBus eventBus) {
         super(configManager, commandManager, eventBus);

src/main/java/com/dmdirc/config/ConfigModule.java

@@ -84,36 +84,18 @@ public class ConfigModule {
         return manager;
     }
 
-    @Provides
-    @com.dmdirc.ClientModule.GlobalConfig
-    public AggregateConfigProvider getOldGlobalConfig(final IdentityController controller) {
-        return controller.getGlobalConfiguration();
-    }
-
     @Provides
     @GlobalConfig
     public AggregateConfigProvider getGlobalConfig(final IdentityController controller) {
         return controller.getGlobalConfiguration();
     }
 
-    @Provides
-    @com.dmdirc.ClientModule.UserConfig
-    public ConfigProvider getOldUserConfig(final IdentityController controller) {
-        return controller.getUserSettings();
-    }
-
     @Provides
     @UserConfig
     public ConfigProvider getUserConfig(final IdentityController controller) {
         return controller.getUserSettings();
     }
 
-    @Provides
-    @com.dmdirc.ClientModule.AddonConfig
-    public ConfigProvider getOldAddonConfig(final IdentityController controller) {
-        return controller.getAddonSettings();
-    }
-
     @Provides
     @AddonConfig
     public ConfigProvider getAddonConfig(final IdentityController controller) {

src/main/java/com/dmdirc/plugins/PluginEventFormatManager.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.plugins;
 
-import com.dmdirc.ClientModule.GlobalConfig;
+import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.events.PluginLoadedEvent;
 import com.dmdirc.events.PluginUnloadedEvent;
 import com.dmdirc.interfaces.EventBus;
@@ -31,17 +31,15 @@ import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.EventFormatProvider;
 import com.dmdirc.ui.messages.MultiEventFormatProvider;
 import com.dmdirc.ui.messages.YamlEventFormatProvider;
+import net.engio.mbassy.listener.Handler;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import net.engio.mbassy.listener.Handler;
-
 /**
  * Loads default event formats from plugins.
  *

src/main/java/com/dmdirc/ui/core/feedback/FeedbackHelper.java

@@ -22,18 +22,17 @@
 
 package com.dmdirc.ui.core.feedback;
 
-import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
+import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.util.ClientInfo;
 
-import java.nio.file.Path;
-
 import javax.inject.Inject;
+import java.nio.file.Path;
 
 public class FeedbackHelper {
 

src/main/java/com/dmdirc/ui/core/feedback/FeedbackSenderFactory.java

@@ -22,14 +22,12 @@
 
 package com.dmdirc.ui.core.feedback;
 
+import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.util.io.Downloader;
-
 import javax.inject.Inject;
 
-import static com.dmdirc.ClientModule.GlobalConfig;
-
 /**
  * Factory for {@link com.dmdirc.ui.core.feedback.FeedbackSender}s
  */

src/main/java/com/dmdirc/ui/core/newserver/CoreNewServerDialogModel.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.ui.core.newserver;
 
-import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.ClientModule.UserConfig;
+import com.dmdirc.config.GlobalConfig;
+import com.dmdirc.config.UserConfig;
 import com.dmdirc.config.profiles.Profile;
 import com.dmdirc.config.profiles.ProfileManager;
 import com.dmdirc.events.ProfileAddedEvent;
@@ -35,24 +35,17 @@ import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.ui.NewServerDialogModel;
 import com.dmdirc.interfaces.ui.NewServerDialogModelListener;
 import com.dmdirc.util.collections.ListenerList;
-import com.dmdirc.util.validators.IntegerPortValidator;
-import com.dmdirc.util.validators.ListNotEmptyValidator;
-import com.dmdirc.util.validators.PermissiveValidator;
-import com.dmdirc.util.validators.ServerNameValidator;
-import com.dmdirc.util.validators.Validator;
-
+import com.dmdirc.util.validators.*;
 import com.google.common.collect.ImmutableList;
+import net.engio.mbassy.listener.Handler;
 
+import javax.inject.Inject;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
-import javax.inject.Inject;
-
-import net.engio.mbassy.listener.Handler;
-
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**

src/main/java/com/dmdirc/ui/messages/UiMessagesModule.java

@@ -22,16 +22,14 @@
 
 package com.dmdirc.ui.messages;
 
-import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
-
-import java.nio.file.Path;
-
-import javax.inject.Singleton;
-
+import com.dmdirc.config.GlobalConfig;
 import dagger.Module;
 import dagger.Provides;
 
+import javax.inject.Singleton;
+import java.nio.file.Path;
+
 import static com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType.BASE;
 
 /**

src/main/java/com/dmdirc/updater/checking/DMDircCheckStrategy.java

@@ -22,15 +22,18 @@
 
 package com.dmdirc.updater.checking;
 
-import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.config.ConfigBinding;
+import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.updater.UpdateChannel;
 import com.dmdirc.updater.UpdateComponent;
 import com.dmdirc.updater.Version;
 import com.dmdirc.util.LogUtils;
 import com.dmdirc.util.io.Downloader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import javax.inject.Inject;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -39,11 +42,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.inject.Inject;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * A strategy which sends a request to the DMDirc update service for information.
  */

src/main/java/com/dmdirc/updater/checking/NightlyChecker.java

@@ -23,16 +23,15 @@
 package com.dmdirc.updater.checking;
 
 import com.dmdirc.config.ConfigBinding;
+import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.updater.UpdateChannel;
 import com.dmdirc.updater.UpdateComponent;
 import com.dmdirc.updater.Version;
 import com.dmdirc.util.io.Downloader;
-
 import com.google.common.base.MoreObjects;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -46,14 +45,10 @@ import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-
 import javax.inject.Inject;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static com.dmdirc.ClientModule.GlobalConfig;
-
 /**
  * Nightly update checker.
  */

src/main/java/com/dmdirc/updater/manager/ConfigComponentPolicy.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.updater.manager;
 
-import com.dmdirc.ClientModule.GlobalConfig;
+import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.updater.UpdateComponent;