Move old config interfaces into config folder.

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

src/com/dmdirc/Channel.java

@@ -28,7 +28,7 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.ChannelCommandParser;
 import com.dmdirc.config.ConfigManager;
-import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.NicklistListener;
 import com.dmdirc.interfaces.TopicChangeListener;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;

src/com/dmdirc/ClientModule.java

@@ -38,8 +38,8 @@ import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.IdentityController;
-import com.dmdirc.interfaces.IdentityFactory;
+import com.dmdirc.interfaces.config.IdentityController;
+import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.ServerFactory;
 import com.dmdirc.logger.ErrorLevel;

src/com/dmdirc/FrameContainer.java

@@ -25,7 +25,7 @@ package com.dmdirc;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.config.ConfigManager;
-import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.FrameCloseListener;
 import com.dmdirc.interfaces.FrameComponentChangeListener;
 import com.dmdirc.interfaces.FrameInfoListener;

src/com/dmdirc/GlobalWindow.java

@@ -29,7 +29,7 @@ import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleter;

src/com/dmdirc/Server.java

@@ -31,9 +31,9 @@ import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.Identity;
 import com.dmdirc.interfaces.AwayStateListener;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.IdentityFactory;
+import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.interfaces.InviteListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;

src/com/dmdirc/ServerManager.java

@@ -27,8 +27,8 @@ import com.dmdirc.commandparser.parsers.ServerCommandParser;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.Identity;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.IdentityController;
-import com.dmdirc.interfaces.IdentityFactory;
+import com.dmdirc.interfaces.config.IdentityController;
+import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.interfaces.ServerFactory;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;

src/com/dmdirc/SystemLifecycleController.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc;
 
-import com.dmdirc.interfaces.IdentityController;
+import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.LifecycleController;
 
 import javax.inject.Inject;

src/com/dmdirc/actions/Action.java

@@ -25,7 +25,7 @@ package com.dmdirc.actions;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
-import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.actions.ActionComparison;
 import com.dmdirc.interfaces.actions.ActionComponent;
 import com.dmdirc.interfaces.actions.ActionType;

src/com/dmdirc/actions/ActionManager.java

@@ -28,7 +28,7 @@ import com.dmdirc.actions.internal.WhoisNumericFormatter;
 import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
-import com.dmdirc.interfaces.IdentityController;
+import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.actions.ActionComparison;
 import com.dmdirc.interfaces.actions.ActionComponent;
 import com.dmdirc.interfaces.actions.ActionType;

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

@@ -32,7 +32,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.IdentityController;
+import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.ServerFactory;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;

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

@@ -31,7 +31,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.IdentityController;
+import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import javax.inject.Inject;

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

@@ -31,7 +31,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.IdentityController;
+import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import javax.inject.Inject;

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

@@ -38,8 +38,8 @@ import com.dmdirc.commandparser.commands.flags.CommandFlagResult;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.Identity;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.IdentityController;
-import com.dmdirc.interfaces.IdentityFactory;
+import com.dmdirc.interfaces.config.IdentityController;
+import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import java.util.List;

src/com/dmdirc/config/CipherUtils.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.config;
 
-import com.dmdirc.interfaces.IdentityController;
+import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 

src/com/dmdirc/config/ConfigBinder.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.config;
 
-import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.Colour;

src/com/dmdirc/config/ConfigManager.java

@@ -23,7 +23,7 @@
 package com.dmdirc.config;
 
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.util.collections.MapList;
 import com.dmdirc.util.validators.Validator;
 

src/com/dmdirc/config/Identity.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.config;
 
-import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;

src/com/dmdirc/config/IdentityManager.java

@@ -23,8 +23,8 @@
 package com.dmdirc.config;
 
 import com.dmdirc.Precondition;
-import com.dmdirc.interfaces.IdentityController;
-import com.dmdirc.interfaces.IdentityFactory;
+import com.dmdirc.interfaces.config.IdentityController;
+import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.updater.Version;

src/com/dmdirc/interfaces/config/AggregateConfigProvider.java

@@ -23,7 +23,6 @@
 package com.dmdirc.interfaces.config;
 
 import com.dmdirc.config.Identity;
-import com.dmdirc.interfaces.ConfigChangeListener;
 
 import java.util.List;
 import java.util.Set;

src/com/dmdirc/interfaces/ConfigChangeListener.java → src/com/dmdirc/interfaces/config/ConfigChangeListener.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.interfaces;
+package com.dmdirc.interfaces.config;
 
 /**
  * Defines the method required for config change listeners.

src/com/dmdirc/interfaces/config/ConfigProvider.java

@@ -23,7 +23,6 @@
 package com.dmdirc.interfaces.config;
 
 import com.dmdirc.config.ConfigTarget;
-import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.util.io.InvalidConfigFileException;
 
 import java.io.IOException;

src/com/dmdirc/interfaces/IdentityController.java → src/com/dmdirc/interfaces/config/IdentityController.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.interfaces;
+package com.dmdirc.interfaces.config;
 
 import com.dmdirc.Precondition;
 import com.dmdirc.config.ConfigManager;

src/com/dmdirc/interfaces/IdentityFactory.java → src/com/dmdirc/interfaces/config/IdentityFactory.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.interfaces;
+package com.dmdirc.interfaces.config;
 
 import com.dmdirc.Precondition;
 import com.dmdirc.config.Identity;

src/com/dmdirc/logger/ErrorManager.java

@@ -24,8 +24,8 @@ package com.dmdirc.logger;
 
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.interfaces.ConfigChangeListener;
-import com.dmdirc.interfaces.IdentityController;
+import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.ui.FatalErrorDialog;
 import com.dmdirc.util.collections.ListenerList;
 

src/com/dmdirc/plugins/PluginManager.java

@@ -26,7 +26,7 @@ import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
-import com.dmdirc.interfaces.IdentityController;
+import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;

src/com/dmdirc/ui/IconManager.java

@@ -23,7 +23,7 @@
 package com.dmdirc.ui;
 
 import com.dmdirc.config.ConfigManager;
-import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.util.URLBuilder;
 
 import java.awt.Image;

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

@@ -32,7 +32,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.ValidatingCommand;
 import com.dmdirc.commandparser.commands.WrappableCommand;
 import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.ui.InputField;
 import com.dmdirc.interfaces.ui.InputValidationListener;
 import com.dmdirc.parser.common.CompositionState;

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

@@ -24,7 +24,7 @@ package com.dmdirc.ui.messages;
 
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.Colour;

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

@@ -23,7 +23,7 @@
 package com.dmdirc.ui.messages;
 
 import com.dmdirc.config.ConfigManager;
-import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.util.collections.ListenerList;
 import com.dmdirc.util.collections.RollingList;
 

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

@@ -25,7 +25,7 @@ package com.dmdirc.ui.messages;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.config.ConfigManager;
-import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.Colour;

src/com/dmdirc/ui/themes/Theme.java

@@ -23,7 +23,7 @@
 package com.dmdirc.ui.themes;
 
 import com.dmdirc.config.InvalidIdentityFileException;
-import com.dmdirc.interfaces.IdentityController;
+import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.util.io.ConfigFile;

src/com/dmdirc/ui/themes/ThemeManager.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.ui.themes;
 
-import com.dmdirc.interfaces.ConfigChangeListener;
-import com.dmdirc.interfaces.IdentityController;
+import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.updater.components;
 
-import com.dmdirc.interfaces.IdentityController;
+import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.ui.StatusMessage;
 import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.updater.UpdateComponent;

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

@@ -23,7 +23,7 @@
 package com.dmdirc.updater.components;
 
 import com.dmdirc.config.ConfigManager;
-import com.dmdirc.interfaces.IdentityController;
+import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.updater.UpdateComponent;
 import com.dmdirc.updater.Version;
 import com.dmdirc.util.resourcemanager.ZipResourceManager;

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

@@ -23,7 +23,7 @@
 package com.dmdirc.updater.components;
 
 import com.dmdirc.config.ConfigManager;
-import com.dmdirc.interfaces.IdentityController;
+import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.updater.UpdateComponent;
 import com.dmdirc.updater.Version;
 import com.dmdirc.util.resourcemanager.ZipResourceManager;

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

@@ -23,7 +23,7 @@
 package com.dmdirc.updater.manager;
 
 import com.dmdirc.config.ConfigBinding;
-import com.dmdirc.interfaces.IdentityController;
+import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.updater.UpdateChannel;
 import com.dmdirc.updater.UpdateComponent;
 import com.dmdirc.updater.checking.DMDircCheckStrategy;

test/com/dmdirc/ServerManagerTest.java

@@ -23,8 +23,8 @@
 package com.dmdirc;
 
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.IdentityController;
-import com.dmdirc.interfaces.IdentityFactory;
+import com.dmdirc.interfaces.config.IdentityController;
+import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 
 import javax.inject.Provider;

test/com/dmdirc/ServerTest.java

@@ -27,7 +27,7 @@ import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.Identity;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.IdentityFactory;
+import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.ui.WindowManager;
 
 import java.net.URI;

test/com/dmdirc/commandparser/commands/global/NewServerTest.java

@@ -27,7 +27,7 @@ import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.config.Identity;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.IdentityController;
+import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.ServerFactory;
 import com.dmdirc.plugins.PluginManager;
 

test/com/dmdirc/config/CipherUtilsTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.config;
 
 import com.dmdirc.TestMain;
 import com.dmdirc.harness.TestCipherUtils;
-import com.dmdirc.interfaces.IdentityController;
+import com.dmdirc.interfaces.config.IdentityController;
 
 import org.junit.Before;
 import org.junit.Test;

test/com/dmdirc/config/ConfigManagerTest.java

@@ -21,7 +21,7 @@
  */
 package com.dmdirc.config;
 
-import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.util.validators.PermissiveValidator;
 
 import java.util.Collections;

test/com/dmdirc/config/IdentityTest.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.config;
 
-import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.util.io.ConfigFile;
 import com.dmdirc.util.validators.PermissiveValidator;
 

test/com/dmdirc/harness/TestCipherUtils.java

@@ -23,7 +23,7 @@
 package com.dmdirc.harness;
 
 import com.dmdirc.config.CipherUtils;
-import com.dmdirc.interfaces.IdentityController;
+import com.dmdirc.interfaces.config.IdentityController;
 
 public class TestCipherUtils extends CipherUtils {
 

test/com/dmdirc/ui/messages/ColourManagerTest.java

@@ -23,7 +23,7 @@
 package com.dmdirc.ui.messages;
 
 import com.dmdirc.config.ConfigManager;
-import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.Colour;