Remove some uses of parser LocalUser.

dcc/src/com/dmdirc/addons/dcc/DCCCommand.java

@@ -116,7 +116,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
             final String target = args.getArguments()[1];
             final Connection connection = ((ServerCommandContext) context).getConnection();
             final Parser parser = connection.getParser().get();
-            final String myNickname = parser.getLocalClient().getNickname();
+            final String myNickname = connection.getLocalUser().getNickname();
 
             if (parser.isValidChannelName(target)
                     || parser.getStringConverter().equalsIgnoreCase(target,

identd/src/com/dmdirc/addons/identd/IdentClient.java

@@ -184,9 +184,9 @@ public class IdentClient implements Runnable {
                 != null && !customName.isEmpty() && customName.length() < 513) {
             username = customName;
         } else if (connection != null && config.getOptionBool(domain, "general.useNickname")) {
-            username = connection.getParser().get().getLocalClient().getNickname();
+            username = connection.getLocalUser().getNickname();
         } else if (connection != null && config.getOptionBool(domain, "general.useUsername")) {
-            username = connection.getParser().get().getLocalClient().getUsername();
+            username = connection.getLocalUser().getUsername().orElse(System.getProperty("user.name"));
         } else {
             username = System.getProperty("user.name");
         }

identd/test/com/dmdirc/addons/identd/IdentClientTest.java

@@ -25,6 +25,7 @@ package com.dmdirc.addons.identd;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.ConnectionManager;
+import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
@@ -50,6 +51,7 @@ public class IdentClientTest {
     @Mock private Connection connection;
     @Mock private IRCParser parser;
     @Mock private IRCClientInfo client;
+    @Mock private User user;
     @Mock private AggregateConfigProvider config;
     @Mock private DMDircMBassador eventBus;
 
@@ -59,10 +61,13 @@ public class IdentClientTest {
 
         when(sm.getConnections()).thenReturn(servers);
         when(connection.getParser()).thenReturn(Optional.of(parser));
+        when(connection.getLocalUser()).thenReturn(user);
         when(parser.getLocalPort()).thenReturn(60);
         when(parser.getLocalClient()).thenReturn(client);
         when(client.getNickname()).thenReturn("nickname");
         when(client.getUsername()).thenReturn("username");
+        when(user.getNickname()).thenReturn("nickname");
+        when(user.getUsername()).thenReturn(Optional.of("username"));
 
         return new IdentClient(eventBus, null, null, sm, config, "plugin-Identd");
     }