Merge pull request #767 from csmith/master

Move Migrator and LifecycleController to bundles.

api/src/main/java/com/dmdirc/interfaces/Migrator.java

-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.interfaces;
-
-/**
- * A class that can perform one-off migration after a client upgrade.
- */
-public interface Migrator {
-
-    /**
-     * Determines whether migration is needed or not.
-     *
-     * @return True if migration is required, false otherwise.
-     */
-    boolean needsMigration();
-
-    /**
-     * Performs the actual migration.
-     */
-    void migrate();
-
-}

api/src/main/java/com/dmdirc/interfaces/LifecycleController.java → bundles/com.dmdirc.util.system/src/main/java/com/dmdirc/util/system/LifecycleController.java

 /*
- * Copyright (c) 2006-2015 DMDirc Developers
+ * Copyright (c) 2006-2017 DMDirc Developers
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+ * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package com.dmdirc.interfaces;
+package com.dmdirc.util.system;
 
 /**
  * Provides methods that control the lifecycle of the application.

bundles/com.dmdirc.util.system/src/main/java/com/dmdirc/util/system/Migrator.java

+/*
+ * Copyright (c) 2006-2017 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+ * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.dmdirc.util.system;
+
+/**
+ * A class that can perform one-off migration after a client upgrade.
+ */
+public interface Migrator {
+
+    /**
+     * Determines whether migration is needed or not.
+     *
+     * @return True if migration is required, false otherwise.
+     */
+    boolean needsMigration();
+
+    /**
+     * Performs the actual migration.
+     */
+    void migrate();
+
+}

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

 import com.dmdirc.interfaces.ConnectionFactory;
 import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.LifecycleController;
+import com.dmdirc.util.system.LifecycleController;
 import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.plugins.PluginModule;

src/main/java/com/dmdirc/Main.java

 import com.dmdirc.interfaces.CommandController.CommandDetails;
 import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.Migrator;
+import com.dmdirc.util.system.Migrator;
 import com.dmdirc.util.system.SystemLifecycleComponent;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.ui.UIController;

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

 import com.dmdirc.events.ClientClosedEvent;
 import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.LifecycleController;
+import com.dmdirc.util.system.LifecycleController;
 import com.dmdirc.util.system.SystemLifecycleComponent;
 import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;

src/main/java/com/dmdirc/commandparser/aliases/ActionAliasMigrator.java

 
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
-import com.dmdirc.interfaces.Migrator;
+import com.dmdirc.util.system.Migrator;
 import com.dmdirc.util.io.ConfigFile;
 import com.dmdirc.util.io.InvalidConfigFileException;
 

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

 
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
-import com.dmdirc.interfaces.Migrator;
+import com.dmdirc.util.system.Migrator;
 import com.dmdirc.util.system.SystemLifecycleComponent;
 
 import java.nio.file.Path;

src/main/java/com/dmdirc/commandparser/aliases/DefaultAliasInstaller.java

 
 package com.dmdirc.commandparser.aliases;
 
-import com.dmdirc.interfaces.Migrator;
+import com.dmdirc.util.system.Migrator;
 
 import java.io.IOException;
 import java.io.InputStream;

src/main/java/com/dmdirc/commandparser/auto/ActionServerPerformMigrator.java

 
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
-import com.dmdirc.interfaces.Migrator;
+import com.dmdirc.util.system.Migrator;
 import com.dmdirc.util.io.ConfigFile;
 import com.dmdirc.util.io.InvalidConfigFileException;
 

src/main/java/com/dmdirc/commandparser/auto/AutoCommandModule.java

 
 package com.dmdirc.commandparser.auto;
 
-import com.dmdirc.interfaces.Migrator;
+import com.dmdirc.util.system.Migrator;
 import com.dmdirc.util.system.SystemLifecycleComponent;
 
 import java.nio.file.Path;

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

 import com.dmdirc.commandparser.commands.BaseCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.LifecycleController;
+import com.dmdirc.util.system.LifecycleController;
 import com.dmdirc.interfaces.WindowModel;
 
 import javax.annotation.Nonnull;

src/main/java/com/dmdirc/config/profiles/IdentitiesProfileMigrator.java

 
 package com.dmdirc.config.profiles;
 
-import com.dmdirc.interfaces.Migrator;
+import com.dmdirc.util.system.Migrator;
 import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.google.common.collect.Lists;

src/main/java/com/dmdirc/config/profiles/ProfilesModule.java

 package com.dmdirc.config.profiles;
 
 import com.dmdirc.commandline.CommandLineOptionsModule;
-import com.dmdirc.interfaces.Migrator;
+import com.dmdirc.util.system.Migrator;
 import com.dmdirc.util.system.SystemLifecycleComponent;
 
 import java.nio.file.Path;