Plugin support for core changes.

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

@@ -115,7 +115,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
         if (args.getArguments().length > 1) {
             final String target = args.getArguments()[1];
             final Connection connection = ((ServerCommandContext) context).getConnection();
-            final Parser parser = connection.getParser();
+            final Parser parser = connection.getParser().get();
             final String myNickname = parser.getLocalClient().getNickname();
 
             if (parser.isValidChannelName(target)
@@ -242,7 +242,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
 
             if (origin.getConfigManager().getOptionBool(
                     myPlugin.getDomain(), "send.reverse")) {
-                final Parser parser = connection.getParser();
+                final Parser parser = connection.getParser().get();
                 final TransferContainer container = new TransferContainer(myPlugin, send,
                         origin.getConfigManager(), backBufferFactory, "Send: " + target,
                         target, connection, urlBuilder, eventBus);
@@ -254,7 +254,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
                         + send.makeToken()
                         + (send.isTurbo() ? " T" : ""));
             } else {
-                final Parser parser = connection.getParser();
+                final Parser parser = connection.getParser().get();
                 if (myPlugin.listen(send)) {
                     final TransferContainer container = new TransferContainer(myPlugin, send,
                             origin.getConfigManager(), backBufferFactory, "*Send: "

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

@@ -395,13 +395,13 @@ public class DCCManager {
             final ClientInfo client, final Connection connection) {
         final String nickname = client.getNickname();
         if (dontAsk) {
-            handleDCCChat(connection.getParser(), nickname, ctcpData);
+            handleDCCChat(connection.getParser().get(), nickname, ctcpData);
         } else {
             eventBus.publish(new DccChatRequestEvent(connection, nickname));
             new StandardQuestionDialog(mainWindow, Dialog.ModalityType.APPLICATION_MODAL,
                     "DCC Chat Request", "User " + nickname + " on " + connection.getAddress()
                     + " would like to start a DCC Chat with you.\n\nDo you want to continue?",
-                    () -> handleDCCChat(connection.getParser(), nickname, ctcpData)).display();
+                    () -> handleDCCChat(connection.getParser().get(), nickname, ctcpData)).display();
         }
     }
 
@@ -518,7 +518,7 @@ public class DCCManager {
                             + " would like to send you a file over DCC.\n\nFile: "
                             + filename + "\n\nDo you want to continue?",
                     () -> handleDCCSend(token, ipLong, portInt, filename, passedSize, nickname,
-                            connection.getParser())).display();
+                            connection.getParser().get())).display();
         }
     }
 
@@ -591,7 +591,7 @@ public class DCCManager {
                         !token.equals(send.getToken())) {
                     continue;
                 }
-                final Parser parser = connection.getParser();
+                final Parser parser = connection.getParser().get();
                 final String nick = client.getNickname();
                 if ("resume".equalsIgnoreCase(ctcpData[0])) {
                     parser.sendCTCP(nick, "DCC", "ACCEPT " + (quoted ? '"'

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

@@ -43,6 +43,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.Optional;
 
+import javax.annotation.Nullable;
 import javax.swing.JOptionPane;
 
 /**
@@ -68,9 +69,11 @@ public class TransferContainer extends FrameContainer implements
     /** Plugin that this send belongs to. */
     private final DCCManager myPlugin;
     /** IRC Parser that caused this send */
-    private Parser parser = null;
+    @Nullable
+    private Parser parser;
     /** Connection the send was initiated on. */
-    private Connection connection = null;
+    @Nullable
+    private Connection connection;
     /** Show open button. */
     private final boolean showOpen = Desktop.isDesktopSupported()
             && Desktop.getDesktop().isSupported(Desktop.Action.OPEN);
@@ -83,7 +86,7 @@ public class TransferContainer extends FrameContainer implements
     public TransferContainer(final DCCManager plugin, final DCCTransfer dcc,
             final AggregateConfigProvider config,
             final BackBufferFactory backBufferFactory, final String title,
-            final String targetNick, final Connection connection,
+            final String targetNick, @Nullable final Connection connection,
             final URLBuilder urlBuilder, final DMDircMBassador eventBus) {
         super(plugin.getContainer(), dcc.getType() == DCCTransfer.TransferType.SEND
                 ? "dcc-send-inactive" : "dcc-receive-inactive",
@@ -93,7 +96,7 @@ public class TransferContainer extends FrameContainer implements
         this.dcc = dcc;
         this.connection = connection;
         this.config = config;
-        parser = connection == null ? null : connection.getParser();
+        parser = Optional.ofNullable(connection).flatMap(Connection::getParser).orElse(null);
         myPlugin = plugin;
 
         if (parser != null) {
@@ -298,11 +301,11 @@ public class TransferContainer extends FrameContainer implements
         dcc.reset();
 
         if (connection != null && connection.getState() == ServerState.CONNECTED) {
-            final String myNickname = connection.getParser().getLocalClient()
+            final String myNickname = connection.getParser().get().getLocalClient()
                     .getNickname();
             // Check again in case we have changed nickname to the same nickname
             //that this send is for.
-            if (connection.getParser().getStringConverter().equalsIgnoreCase(
+            if (connection.getParser().get().getStringConverter().equalsIgnoreCase(
                     otherNickname, myNickname)) {
                 final Thread errorThread = new Thread(() -> {
                     JOptionPane.showMessageDialog(null,
@@ -345,10 +348,9 @@ public class TransferContainer extends FrameContainer implements
     }
 
     public void addSocketCloseCallback(final SocketCloseListener listener) {
-        if (connection != null && connection.getParser() != null) {
-            connection.getParser().getCallbackManager()
-                    .addNonCriticalCallback(SocketCloseListener.class,
-                            listener);
+        if (connection != null) {
+            connection.getParser().map(Parser::getCallbackManager).ifPresent(
+                    cbm -> cbm.addNonCriticalCallback(SocketCloseListener.class, listener));
         }
     }
 

debug/src/com/dmdirc/addons/debug/commands/ServerInfo.java

@@ -68,17 +68,17 @@ public class ServerInfo extends DebugCommand {
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Server name: "
                     + connection.getAddress());
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Actual name: "
-                    + connection.getParser().getServerName());
+                    + connection.getParser().get().getServerName());
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Network: "
                     + connection.getNetwork());
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "IRCd: "
-                    + connection.getParser().getServerSoftware() + " - "
-                    + connection.getParser().getServerSoftwareType());
+                    + connection.getParser().get().getServerSoftware() + " - "
+                    + connection.getParser().get().getServerSoftwareType());
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Modes: "
-                    + connection.getParser().getBooleanChannelModes() + ' '
-                    + connection.getParser().getListChannelModes() + ' '
-                    + connection.getParser().getParameterChannelModes() + ' '
-                    + connection.getParser().getDoubleParameterChannelModes());
+                    + connection.getParser().get().getBooleanChannelModes() + ' '
+                    + connection.getParser().get().getListChannelModes() + ' '
+                    + connection.getParser().get().getParameterChannelModes() + ' '
+                    + connection.getParser().get().getDoubleParameterChannelModes());
         } else {
             sendLine(origin, args.isSilent(), FORMAT_ERROR,
                     "This window isn't connected to a server");

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().getLocalClient().getNickname();
+            username = connection.getParser().get().getLocalClient().getNickname();
         } else if (connection != null && config.getOptionBool(domain, "general.useUsername")) {
-            username = connection.getParser().getLocalClient().getUsername();
+            username = connection.getParser().get().getLocalClient().getUsername();
         } else {
             username = System.getProperty("user.name");
         }
@@ -240,7 +240,7 @@ public class IdentClient implements Runnable {
      */
     protected Connection getConnectionByPort(final int port) {
         for (Connection connection : connectionManager.getConnections()) {
-            if (connection.getParser().getLocalPort() == port) {
+            if (connection.getParser().get().getLocalPort() == port) {
                 return connection;
             }
         }

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

@@ -31,6 +31,7 @@ import com.dmdirc.parser.irc.IRCParser;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -57,7 +58,7 @@ public class IdentClientTest {
         servers.add(connection);
 
         when(sm.getConnections()).thenReturn(servers);
-        when(connection.getParser()).thenReturn(parser);
+        when(connection.getParser()).thenReturn(Optional.of(parser));
         when(parser.getLocalPort()).thenReturn(60);
         when(parser.getLocalClient()).thenReturn(client);
         when(client.getNickname()).thenReturn("nickname");

lagdisplay/src/com/dmdirc/addons/lagdisplay/LagDisplayManager.java

@@ -257,7 +257,7 @@ public class LagDisplayManager implements ConfigChangeListener {
                 getOptionBool(domain, "usealternate")) {
             return;
         }
-        event.getConnection().getParser().sendRawMessage("LAGCHECK_" + new Date().getTime());
+        event.getConnection().getParser().get().sendRawMessage("LAGCHECK_" + new Date().getTime());
     }
 
     /**

logging/src/com/dmdirc/addons/logging/LoggingManager.java

@@ -213,7 +213,7 @@ public class LoggingManager implements ConfigChangeListener {
 
     @Handler
     public void handleQueryOpened(final QueryOpenedEvent event) {
-        final Parser parser = event.getQuery().getConnection().get().getParser();
+        final Parser parser = event.getQuery().getConnection().get().getParser().get();
         final ClientInfo client = parser.getClient(event.getQuery().getHost());
         final String filename = locator.getLogFile(client);
         if (autobackbuffer) {
@@ -229,7 +229,7 @@ public class LoggingManager implements ConfigChangeListener {
 
     @Handler
     public void handleQueryClosed(final QueryClosedEvent event) {
-        final Parser parser = event.getQuery().getConnection().get().getParser();
+        final Parser parser = event.getQuery().getConnection().get().getParser().get();
         final ClientInfo client = parser.getClient(event.getQuery().getHost());
         final String filename = locator.getLogFile(client);
 
@@ -584,7 +584,7 @@ public class LoggingManager implements ConfigChangeListener {
         if (target instanceof Channel) {
             descriptor = target.getName();
         } else if (target instanceof Query) {
-            final Parser parser = target.getConnection().get().getParser();
+            final Parser parser = target.getConnection().get().getParser().get();
             descriptor = parser.getClient(((PrivateChat) target).getHost()).getNickname();
         } else {
             // Unknown component

parserdebug/src/com/dmdirc/addons/parserdebug/ParserDebugCommand.java

@@ -34,6 +34,8 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Optional;
+
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
@@ -78,20 +80,20 @@ public final class ParserDebugCommand extends Command {
         final boolean isSilent = commandArgs.isSilent();
 
         final Connection connection = ((ServerCommandContext) context).getConnection();
-        final Parser parser = connection.getParser();
+        final Optional<Parser> parser = connection.getParser();
 
-        if (parser == null) {
+        if (!parser.isPresent()) {
             sendLine(origin, isSilent, FORMAT_ERROR, "Unable to get a parser for this window.");
             return;
         }
-        if (parserDebugManager.containsParser(parser)) {
-            if (parserDebugManager.removeParser(parser, false)) {
+        if (parserDebugManager.containsParser(parser.get())) {
+            if (parserDebugManager.removeParser(parser.get(), false)) {
                 sendLine(origin, isSilent, FORMAT_OUTPUT, "Removing callback ok");
             } else {
                 sendLine(origin, isSilent, FORMAT_ERROR, "Removing callback failed");
             }
         } else {
-            if (parserDebugManager.addParser(parser, connection)) {
+            if (parserDebugManager.addParser(parser.get(), connection)) {
                 sendLine(origin, isSilent, FORMAT_OUTPUT, "Adding callback ok");
             } else {
                 sendLine(origin, isSilent, FORMAT_ERROR, "Adding callback failed");

parserdebug/src/com/dmdirc/addons/parserdebug/ParserDebugManager.java

@@ -152,7 +152,7 @@ public class ParserDebugManager implements DebugInfoListener {
 
     @Handler
     public void handleServerDisconnected(final ServerDisconnectedEvent event) {
-            final Parser parser = event.getConnection().getParser();
+            final Parser parser = event.getConnection().getParser().get();
             if (registeredParsers.containsKey(parser)) {
                 removeParser(parser, false);
             }

ui_swing/src/com/dmdirc/addons/ui_swing/components/modes/ChannelModesPane.java

@@ -64,13 +64,13 @@ public final class ChannelModesPane extends ModesPane {
 
     @Override
     public boolean isModeSettable(final String mode) {
-        return channel.getConnection().get().getParser().isUserSettable(
-                mode.toCharArray()[0]);
+        return channel.getConnection().get().getParser().get().isUserSettable(mode.toCharArray()
+                [0]);
     }
 
     @Override
     public String getAvailableBooleanModes() {
-        return channel.getConnection().get().getParser().getBooleanChannelModes();
+        return channel.getConnection().get().getParser().get().getBooleanChannelModes();
     }
 
     @Override
@@ -80,7 +80,7 @@ public final class ChannelModesPane extends ModesPane {
 
     @Override
     public String getAllParamModes() {
-        final Parser parser = channel.getConnection().get().getParser();
+        final Parser parser = channel.getConnection().get().getParser().get();
         return parser.getParameterChannelModes()
                 + parser.getDoubleParameterChannelModes();
     }

ui_swing/src/com/dmdirc/addons/ui_swing/components/modes/UserModesPane.java

@@ -68,12 +68,12 @@ public final class UserModesPane extends ModesPane {
 
     @Override
     public String getAvailableBooleanModes() {
-        return connection.getParser().getUserModes();
+        return connection.getParser().get().getUserModes();
     }
 
     @Override
     public String getOurBooleanModes() {
-        return connection.getParser().getLocalClient().getModes();
+        return connection.getParser().get().getLocalClient().getModes();
     }
 
     @Override
@@ -89,12 +89,12 @@ public final class UserModesPane extends ModesPane {
     @Override
     public void alterMode(final boolean add, final String mode,
             final String parameter) {
-        connection.getParser().getLocalClient().alterMode(add, mode.toCharArray()[0]);
+        connection.getParser().get().getLocalClient().alterMode(add, mode.toCharArray()[0]);
     }
 
     @Override
     public void flushModes() {
-        connection.getParser().getLocalClient().flushModes();
+        connection.getParser().get().getLocalClient().flushModes();
     }
 
 }

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelListModesPane.java

@@ -137,7 +137,7 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
         }
         listModesPanel = new JScrollPane();
         listModesPanels = new ArrayList<>();
-        listModesArray = channel.getConnection().get().getParser()
+        listModesArray = channel.getConnection().get().getParser().get()
                 .getListChannelModes().toCharArray();
         existingListItems = new MapList<>();
         listModesMenu = new JComboBox<>(new DefaultComboBoxModel<>());
@@ -355,7 +355,7 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
 
         final int selected = listModesMenu.getSelectedIndex();
         final int current = listModesPanels.get(selected).getModel().getSize();
-        final int maxModes = channel.getConnection().get().getParser().
+        final int maxModes = channel.getConnection().get().getParser().get().
                 getMaxListModes(listModesArray[selected]);
 
         if (maxModes == -1) {

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicDisplayPane.java

@@ -101,7 +101,7 @@ public class TopicDisplayPane extends JPanel implements DocumentListener {
         this.clipboard = clipboard;
         this.channel = channel;
         this.parent = parent;
-        topicLengthMax = channel.getConnection().get().getParser().getMaxTopicLength();
+        topicLengthMax = channel.getConnection().get().getParser().get().getMaxTopicLength();
         this.channelWindow = channelWindow;
         this.eventBus = eventBus;
 

windowstatus/src/com/dmdirc/addons/windowstatus/WindowStatusManager.java

@@ -196,7 +196,7 @@ public class WindowStatusManager implements ConfigChangeListener {
         textString.append(frame.getHost());
         final Optional<Connection> connection = frame.getConnection();
         if (showname && connection.isPresent()) {
-            final ClientInfo client = connection.get().getParser().getClient(frame.getHost());
+            final ClientInfo client = connection.get().getParser().get().getClient(frame.getHost());
             final String realname = client.getRealname();
             if (realname != null && !realname.isEmpty()) {
                 textString.append(" - ");