Add com.dmdirc.util.system bundle.

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

@@ -1,50 +0,0 @@
-/*
- * 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 component that participates in or needs to know about the system lifecycle.
- */
-public interface SystemLifecycleComponent {
-
-    /**
-     * Called when the system or component is starting up.
-     */
-    void startUp();
-
-    /**
-     * Indicates that the component should save any configuration or other data to disk.
-     */
-    default void save() {}
-
-    /**
-     * Called when the system or component is shutting down.
-     * <p>
-     * Any resources or threads used by the implementing class must be released before returning
-     * from this method.
-     */
-    default void shutDown() {
-        save();
-    }
-
-}

build.gradle

@@ -49,6 +49,7 @@ dependencies {
     bundle group: 'com.dmdirc', name: 'com.dmdirc.config.binding', version: '+', changing: true
     bundle group: 'com.dmdirc', name: 'com.dmdirc.events.eventbus', version: '+', changing: true
     bundle group: 'com.dmdirc', name: 'com.dmdirc.util.io.yaml', version: '+', changing: true
+    bundle group: 'com.dmdirc', name: 'com.dmdirc.util.system', version: '+', changing: true
 
     bundle group: 'com.dmdirc', name: 'api', version: '+', changing: true
     bundle group: 'com.dmdirc', name: 'util', version: '+', changing: true

bundles/com.dmdirc.util.system/build.gradle

@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+
+plugins {
+    id 'java'
+    id 'findbugs'
+    id 'pmd'
+    id 'idea'
+    id 'osgi'
+}
+
+group = 'com.dmdirc'
+
+idea {
+    module {
+         sourceDirs += file('src/main/generated')
+         testSourceDirs += file('src/test/generated_tests')
+         generatedSourceDirs = [file('src/main/generated'), file('src/test/generated_tests')]
+    }
+}
+
+configurations.all {
+    resolutionStrategy.cacheDynamicVersionsFor 2, 'minutes'
+    resolutionStrategy.cacheChangingModulesFor 2, 'minutes'
+}
+
+dependencies {
+    compile group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
+    compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.21'
+
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testCompile group: 'org.mockito', name: 'mockito-core', version: '1.10.19'
+}
+
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+
+repositories {
+    mavenCentral()
+}
+

src/main/java/com/dmdirc/util/SystemInfo.java → bundles/com.dmdirc.util.system/src/main/java/com/dmdirc/util/system/SystemInfo.java

@@ -15,19 +15,13 @@
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package com.dmdirc.util;
-
-import javax.inject.Inject;
+package com.dmdirc.util.system;
 
 /**
  * Injectable wrapper around {@link System}
  */
 public class SystemInfo {
 
-    @Inject
-    public SystemInfo() {
-    }
-
     public String getProperty(final String key) {
         return System.getProperty(key);
     }
@@ -35,4 +29,5 @@ public class SystemInfo {
     public String getenv(final String name) {
         return System.getenv(name);
     }
+
 }

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

@@ -0,0 +1,45 @@
+/*
+ * 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 component that participates in or needs to know about the system lifecycle.
+ */
+public interface SystemLifecycleComponent {
+
+    /**
+     * Called when the system or component is starting up.
+     */
+    void startUp();
+
+    /**
+     * Indicates that the component should save any configuration or other data to disk.
+     */
+    default void save() {}
+
+    /**
+     * Called when the system or component is shutting down.
+     * <p>
+     * Any resources or threads used by the implementing class must be released before returning
+     * from this method.
+     */
+    default void shutDown() {
+        save();
+    }
+
+}

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

@@ -44,6 +44,7 @@ import com.dmdirc.ui.themes.ThemeManager;
 import com.dmdirc.updater.UpdaterModule;
 import com.dmdirc.util.LoggingExecutorService;
 import com.dmdirc.util.io.Downloader;
+import com.dmdirc.util.system.SystemInfo;
 import dagger.Module;
 import dagger.ObjectGraph;
 import dagger.Provides;
@@ -75,6 +76,12 @@ public class ClientModule {
     /** The object graph to inject where necessary. */
     private ObjectGraph objectGraph;
 
+    @Provides
+    @Singleton
+    public SystemInfo getSystemInfo() {
+        return new SystemInfo();
+    }
+
     @Provides
     public ConnectionManager getConnectionManager(final ServerManager serverManager) {
         return serverManager;

src/main/java/com/dmdirc/LauncherUtils.java

@@ -20,7 +20,7 @@ package com.dmdirc;
 import com.dmdirc.commandline.BaseDirectoryLocator;
 import com.dmdirc.commandline.CommandLineParser;
 import com.dmdirc.updater.Version;
-import com.dmdirc.util.SystemInfo;
+import com.dmdirc.util.system.SystemInfo;
 
 /**
  * Utility class to help launcher interface with client.

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

@@ -27,7 +27,7 @@ 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.interfaces.SystemLifecycleComponent;
+import com.dmdirc.util.system.SystemLifecycleComponent;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.logger.DMDircExceptionHandler;

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

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

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

@@ -17,7 +17,7 @@
 
 package com.dmdirc.commandline;
 
-import com.dmdirc.util.SystemInfo;
+import com.dmdirc.util.system.SystemInfo;
 
 import java.io.File;
 

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

@@ -21,7 +21,7 @@ import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.util.InvalidURIException;
-import com.dmdirc.util.SystemInfo;
+import com.dmdirc.util.system.SystemInfo;
 import com.dmdirc.util.URIParser;
 
 import java.io.File;

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

@@ -17,7 +17,7 @@
 
 package com.dmdirc.commandparser.aliases;
 
-import com.dmdirc.interfaces.SystemLifecycleComponent;
+import com.dmdirc.util.system.SystemLifecycleComponent;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;

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

@@ -20,7 +20,7 @@ package com.dmdirc.commandparser.aliases;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
 import com.dmdirc.interfaces.Migrator;
-import com.dmdirc.interfaces.SystemLifecycleComponent;
+import com.dmdirc.util.system.SystemLifecycleComponent;
 
 import java.nio.file.Path;
 

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

@@ -17,7 +17,7 @@
 
 package com.dmdirc.commandparser.auto;
 
-import com.dmdirc.interfaces.SystemLifecycleComponent;
+import com.dmdirc.util.system.SystemLifecycleComponent;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;

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

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

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

@@ -20,7 +20,7 @@ package com.dmdirc.config.profiles;
 import com.dmdirc.events.ProfileAddedEvent;
 import com.dmdirc.events.ProfileDeletedEvent;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.util.SystemInfo;
+import com.dmdirc.util.system.SystemInfo;
 
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;

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

@@ -17,7 +17,7 @@
 
 package com.dmdirc.config.profiles;
 
-import com.dmdirc.interfaces.SystemLifecycleComponent;
+import com.dmdirc.util.system.SystemLifecycleComponent;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;

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

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

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

@@ -21,7 +21,7 @@ import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.events.PluginLoadedEvent;
 import com.dmdirc.events.PluginUnloadedEvent;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.SystemLifecycleComponent;
+import com.dmdirc.util.system.SystemLifecycleComponent;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.EventFormatProvider;
 import com.dmdirc.ui.messages.MultiEventFormatProvider;

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

@@ -18,7 +18,7 @@
 package com.dmdirc.plugins;
 
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.SystemLifecycleComponent;
+import com.dmdirc.util.system.SystemLifecycleComponent;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.updater.manager.UpdateManager;
 

src/test/java/com/dmdirc/config/profiles/ProfileManagerTest.java

@@ -25,7 +25,7 @@ package com.dmdirc.config.profiles;
 import com.dmdirc.events.ProfileAddedEvent;
 import com.dmdirc.events.ProfileDeletedEvent;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.util.SystemInfo;
+import com.dmdirc.util.system.SystemInfo;
 
 import com.google.common.collect.Lists;