Merge remote-tracking branch 'origin/master'

src/main/java/com/dmdirc/ParserFactory.java

@@ -18,7 +18,7 @@
 package com.dmdirc;
 
 import com.dmdirc.config.profiles.Profile;
-import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
+import com.dmdirc.config.provider.ReadOnlyConfigProvider;
 import com.dmdirc.parser.common.MyInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.ProtocolDescription;
@@ -26,14 +26,11 @@ import com.dmdirc.plugins.NoSuchProviderException;
 import com.dmdirc.plugins.Service;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.plugins.ServiceProvider;
-
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Optional;
-
 import javax.annotation.Nullable;
 import javax.inject.Inject;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

@@ -28,22 +28,21 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.flags.CommandFlag;
 import com.dmdirc.commandparser.commands.flags.CommandFlagHandler;
 import com.dmdirc.commandparser.commands.flags.CommandFlagResult;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
+import com.dmdirc.config.provider.ReadOnlyConfigProvider;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.config.provider.AggregateConfigProvider;
-import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.config.IdentityFactory;
-import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-
+import java.util.List;
+import java.util.Optional;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
-import java.util.List;
-import java.util.Optional;
 
 /**
  * The set command allows the user to inspect and change global config settings.

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

@@ -26,22 +26,20 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.ExternalCommand;
 import com.dmdirc.commandparser.commands.PreviousCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.config.provider.ReadOnlyConfigProvider;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.events.UnknownCommandEvent;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.InputModel;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
 import com.dmdirc.util.collections.RollingList;
-
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 

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

@@ -17,8 +17,7 @@
 
 package com.dmdirc.config;
 
-import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
-
+import com.dmdirc.config.provider.ReadOnlyConfigProvider;
 import java.util.List;
 
 /**

src/main/java/com/dmdirc/config/prefs/PreferencesSetting.java

@@ -18,12 +18,10 @@
 package com.dmdirc.config.prefs;
 
 import com.dmdirc.config.provider.ConfigProvider;
-import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
+import com.dmdirc.config.provider.ReadOnlyConfigProvider;
 import com.dmdirc.util.validators.PermissiveValidator;
 import com.dmdirc.util.validators.Validator;
-
 import com.google.common.collect.Table;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;

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

@@ -18,9 +18,9 @@
 package com.dmdirc.interfaces.config;
 
 import com.dmdirc.config.ConfigFileBackedConfigProvider;
-
 import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.config.provider.ConfigProvider;
+import com.dmdirc.config.provider.ReadOnlyConfigProvider;
 import java.util.Collection;
 
 /**

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

@@ -17,9 +17,8 @@
 
 package com.dmdirc.plugins;
 
-import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
+import com.dmdirc.config.provider.ReadOnlyConfigProvider;
 import com.dmdirc.updater.Version;
-
 import javax.inject.Inject;
 import javax.inject.Singleton;
 

src/test/java/com/dmdirc/config/ConfigValueRetrieverTest.java

@@ -22,12 +22,9 @@
 
 package com.dmdirc.config;
 
-import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
-
+import com.dmdirc.config.provider.ReadOnlyConfigProvider;
 import com.google.common.collect.Lists;
-
 import java.util.List;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

src/test/java/com/dmdirc/harness/TestConfigSource.java

@@ -22,9 +22,8 @@
 
 package com.dmdirc.harness;
 
-import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
+import com.dmdirc.config.provider.ReadOnlyConfigProvider;
 import com.dmdirc.util.validators.Validator;
-
 import java.util.Map;
 
 public class TestConfigSource implements ReadOnlyConfigProvider {