Merge pull request #564 from greboid/dev2

Add launcher version to the about dialog.

src/com/dmdirc/commandline/CommandLineParser.java

@@ -38,6 +38,7 @@ import java.nio.file.Paths;
 import java.rmi.RemoteException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
@@ -78,7 +79,7 @@ public class CommandLineParser {
     /** Whether to disable error reporting or not. */
     private boolean disablereporting;
     /** The version string passed for the launcher. */
-    private String launcherVersion;
+    private Optional<String> launcherVersion;
     /** The configuration directory. */
     private String configDirectory;
     /** The RMI server we're using. */
@@ -101,6 +102,7 @@ public class CommandLineParser {
         this.globalConfigProvider = globalConfigProvider;
         this.uriParser = uriParser;
         this.systemInfo = systemInfo;
+        launcherVersion = Optional.empty();
     }
 
     /**
@@ -239,7 +241,7 @@ public class CommandLineParser {
                 doHelp();
                 break;
             case 'l':
-                launcherVersion = param;
+                launcherVersion = Optional.ofNullable(param);
                 break;
             case 'p':
                 doDirectory(Paths.get(systemInfo.getProperty("user.dir")));
@@ -416,7 +418,7 @@ public class CommandLineParser {
      *
      * @return The version supplied by the launcher, or {@code null} if no launcher is identified.
      */
-    public String getLauncherVersion() {
+    public Optional<String> getLauncherVersion() {
         return launcherVersion;
     }
 

src/com/dmdirc/ui/core/about/CoreAboutDialogModel.java

@@ -26,6 +26,7 @@ import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandline.CommandLineOptionsModule;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
+import com.dmdirc.commandline.CommandLineParser;
 import com.dmdirc.events.ClientInfoRequestEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.AboutDialogModel;
@@ -65,17 +66,19 @@ public class CoreAboutDialogModel implements AboutDialogModel {
     private List<Developer> otherDevelopers;
     private List<InfoItem> info;
     private List<LicensedComponent> licences;
+    private CommandLineParser commandLineParser;
 
     @Inject
     public CoreAboutDialogModel(@GlobalConfig final AggregateConfigProvider globalConfig,
             @Directory(CommandLineOptionsModule.DirectoryType.BASE) final Path baseDirectory,
             final ClientInfo clientInfo, final DMDircMBassador eventBus,
-            final PluginManager pluginManager) {
+            final PluginManager pluginManager, final CommandLineParser commandLineParser) {
         this.globalConfig = globalConfig;
         this.baseDirectory = baseDirectory;
         this.clientInfo = clientInfo;
         this.eventBus = eventBus;
         this.pluginManager = pluginManager;
+        this.commandLineParser = commandLineParser;
         about = "";
         mainDevelopers = new ArrayList<>();
         otherDevelopers = new ArrayList<>();
@@ -118,7 +121,9 @@ public class CoreAboutDialogModel implements AboutDialogModel {
                         InfoItem.create("Java Default charset",
                                 Charset.defaultCharset().displayName()),
                         InfoItem.create("Client Uptime",
-                                DateUtils.formatDuration((int) clientInfo.getUptime() / 1000)));
+                                DateUtils.formatDuration((int) clientInfo.getUptime() / 1000)),
+                        InfoItem.create("Launcher Version",
+                                commandLineParser.getLauncherVersion().orElse("Unknown")));
     }
 
     private List<LicensedComponent> createLicensedComponents() {

src/com/dmdirc/updater/UpdaterModule.java

@@ -109,10 +109,8 @@ public class UpdaterModule {
             final DMDircMBassador eventBus) {
         UpdateChecker.init(updateManager, identityController, eventBus);
 
-        if (commandLineParser.getLauncherVersion() != null) {
-            LauncherComponent.setLauncherInfo(updateManager,
-                    commandLineParser.getLauncherVersion());
-        }
+        commandLineParser.getLauncherVersion().ifPresent(version ->
+                LauncherComponent.setLauncherInfo(updateManager, version));
 
         return updateManager;
     }

test/com/dmdirc/ui/core/about/CoreAboutDialogModelTest.java

@@ -23,6 +23,7 @@
 package com.dmdirc.ui.core.about;
 
 import com.dmdirc.DMDircMBassador;
+import com.dmdirc.commandline.CommandLineParser;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
@@ -34,6 +35,7 @@ import com.google.common.collect.Lists;
 
 import java.nio.file.Path;
 import java.util.List;
+import java.util.Optional;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -57,6 +59,7 @@ public class CoreAboutDialogModelTest {
     @Mock private PluginMetaData pluginMetaData2;
     @Mock private PluginInfo pluginInfo1;
     @Mock private PluginInfo pluginInfo2;
+    @Mock private CommandLineParser commandLineParser;
     private CoreAboutDialogModel instance;
 
     @Before
@@ -74,7 +77,9 @@ public class CoreAboutDialogModelTest {
         when(pluginInfo2.getMetaData()).thenReturn(pluginMetaData2);
         when(pluginMetaData1.getFriendlyName()).thenReturn("Plugin1");
         when(pluginMetaData2.getFriendlyName()).thenReturn("Plugin2");
-        instance = new CoreAboutDialogModel(globalConfig, path, clientInfo, eventBus, pluginManager);
+        when(commandLineParser.getLauncherVersion()).thenReturn(Optional.of("Unknown"));
+        instance = new CoreAboutDialogModel(globalConfig, path, clientInfo, eventBus,
+                pluginManager, commandLineParser);
         instance.load();
     }
 
@@ -109,7 +114,7 @@ public class CoreAboutDialogModelTest {
 
     @Test
     public void testGetInfo() throws Exception {
-        assertEquals(6, instance.getInfo().size());
+        assertEquals(7, instance.getInfo().size());
     }
 
     @Test