Merge pull request #173 from csmith/master

Remove some deprecated uses of getConnection().

src/com/dmdirc/ChannelEventHandler.java

@@ -114,7 +114,7 @@ public class ChannelEventHandler extends EventHandler implements
     @Nonnull
     @Override
     protected Connection getConnection() {
-        return owner.getConnection();
+        return owner.getOptionalConnection().get();
     }
 
     /**
@@ -125,7 +125,7 @@ public class ChannelEventHandler extends EventHandler implements
      * @return True if the client is ourself, false otherwise.
      */
     protected boolean isMyself(final ChannelClientInfo client) {
-        return client.getClient().equals(owner.getConnection().getParser().getLocalClient());
+        return client.getClient().equals(getConnection().getParser().getLocalClient());
     }
 
     @Override
@@ -321,7 +321,7 @@ public class ChannelEventHandler extends EventHandler implements
         final ChannelCtcpEvent event = new ChannelCtcpEvent(owner, client, type, message);
         final String format = EventUtils.postDisplayable(eventBus, event, "channelCTCP");
         if (!event.isHandled()) {
-            owner.getConnection().sendCTCPReply(client.getClient().getNickname(), type, message);
+            getConnection().sendCTCPReply(client.getClient().getNickname(), type, message);
         }
         owner.doNotification(date, format, client, type, message);
     }

src/com/dmdirc/CustomWindow.java

@@ -28,7 +28,7 @@ import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
 
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.Optional;
 
 /**
@@ -52,7 +52,7 @@ public class CustomWindow extends FrameContainer {
             final ColourManagerFactory colourManagerFactory) {
         super(parent, "custom", name, title, parent.getConfigManager(), colourManagerFactory,
                 urlBuilder, parent.getEventBus(),
-                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
+                Collections.singletonList(WindowComponent.TEXTAREA.getIdentifier()));
     }
 
     /**
@@ -72,12 +72,12 @@ public class CustomWindow extends FrameContainer {
             final DMDircMBassador eventBus,
             final ColourManagerFactory colourManagerFactory) {
         super(null, "custom", name, title, configProvider, colourManagerFactory, urlBuilder,
-                eventBus, Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
+                eventBus, Collections.singletonList(WindowComponent.TEXTAREA.getIdentifier()));
     }
 
     @Override
     public Connection getConnection() {
-        return getParent().map(FrameContainer::getConnection).orElse(null);
+        return getOptionalConnection().orElse(null);
     }
 
     @Override

src/com/dmdirc/actions/CoreActionComponent.java

@@ -736,7 +736,7 @@ public enum CoreActionComponent implements ActionComponent {
     WINDOW_SERVER {
         @Override
         public Object get(final Object arg) {
-            return ((Window) arg).getContainer().getConnection();
+            return ((Window) arg).getContainer().getOptionalConnection().orElse(null);
         }
 
         @Override

src/com/dmdirc/commandparser/commands/channel/Mode.java

@@ -74,7 +74,7 @@ public class Mode extends Command implements IntelligentCommand,
         if (args.getArguments().length == 0) {
             sendLine(origin, args.isSilent(), "channelModeDiscovered", cChannel.getModes(), cChannel);
         } else {
-            channel.getConnection().getParser().sendRawMessage("MODE "
+            channel.getOptionalConnection().get().getParser().sendRawMessage("MODE "
                     + cChannel + " " + args.getArgumentsAsString());
         }
     }

src/com/dmdirc/commandparser/commands/channel/Names.java

@@ -67,7 +67,7 @@ public class Names extends Command implements IntelligentCommand,
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Channel channel = ((ChannelCommandContext) context).getChannel();
-        channel.getConnection().getParser().sendRawMessage("NAMES "
+        channel.getOptionalConnection().get().getParser().sendRawMessage("NAMES "
                 + channel.getChannelInfo().getName());
     }
 

src/com/dmdirc/commandparser/commands/channel/ShowTopic.java

@@ -71,8 +71,8 @@ public class ShowTopic extends Command implements ExternalCommand {
             if (cChannel.getTopic().isEmpty()) {
                 sendLine(origin, args.isSilent(), "channelNoTopic", cChannel);
             } else {
-                final String[] parts = channel.getConnection().parseHostmask(cChannel.
-                        getTopicSetter());
+                final String[] parts = channel.getOptionalConnection().get().parseHostmask(
+                        cChannel.getTopicSetter());
 
                 sendLine(origin, args.isSilent(), "channelTopicDiscovered",
                         "", parts[0], parts[1], parts[2], cChannel.getTopic(),

src/com/dmdirc/commandparser/commands/chat/Me.java

@@ -33,8 +33,12 @@ import com.dmdirc.commandparser.commands.ValidatingCommand;
 import com.dmdirc.commandparser.commands.context.ChatCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.Connection;
+import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.util.validators.ValidationResponse;
 
+import java.util.Optional;
+
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
@@ -74,15 +78,16 @@ public class Me extends Command implements ValidatingCommand {
     public ValidationResponse validateArguments(
             final FrameContainer origin,
             final CommandArguments arguments) {
-        if (origin.getConnection() == null
-                || origin.getConnection().getParser() == null) {
+        final Optional<Connection> connection = origin.getOptionalConnection();
+        final Optional<Parser> parser = connection.flatMap(c -> Optional.ofNullable(c.getParser()));
+
+        if (!parser.isPresent()) {
             return new ValidationResponse();
         }
 
         final int length = 2 + arguments.getArgumentsAsString().length();
 
-        if (origin.getConnection().getParser().getMaxLength("PRIVMSG",
-                origin.getName()) <= length) {
+        if (parser.get().getMaxLength("PRIVMSG", origin.getName()) <= length) {
             return new ValidationResponse("Too long");
         } else {
             return new ValidationResponse();

src/com/dmdirc/commandparser/parsers/CommandParser.java

@@ -44,6 +44,7 @@ import com.dmdirc.util.collections.RollingList;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 
 import javax.annotation.Nonnull;
 
@@ -178,14 +179,16 @@ public abstract class CommandParser implements Serializable {
         final boolean silent = args.isSilent();
         final String command = args.getCommandName();
         final String[] cargs = args.getArguments();
+        final Optional<Connection> connection = origin.getOptionalConnection();
 
-        if (cargs.length == 0 || !parseChannel
-                || origin.getConnection() == null
+        if (cargs.length == 0
+                || !parseChannel
+                || !connection.isPresent()
                 || !commandManager.isChannelCommand(command)) {
             return false;
         }
 
-        final Connection server = origin.getConnection();
+        final Connection server = connection.get();
         final String[] parts = cargs[0].split(",");
         boolean someValid = false;
         for (String part : parts) {

test/com/dmdirc/commandparser/commands/channel/ModeTest.java

@@ -32,6 +32,8 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Optional;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -54,7 +56,7 @@ public class ModeTest {
 
     @Before
     public void setUp() throws InvalidIdentityFileException {
-        when(channel.getConnection()).thenReturn(server);
+        when(channel.getOptionalConnection()).thenReturn(Optional.of(server));
         when(server.getParser()).thenReturn(parser);
         when(channel.getChannelInfo()).thenReturn(channelinfo);
         when(channelinfo.getModes()).thenReturn("my mode string!");

test/com/dmdirc/commandparser/commands/channel/NamesTest.java

@@ -31,13 +31,16 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Optional;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class NamesTest {
@@ -52,7 +55,7 @@ public class NamesTest {
 
     @Before
     public void setUp() throws InvalidIdentityFileException {
-        when(channel.getConnection()).thenReturn(server);
+        when(channel.getOptionalConnection()).thenReturn(Optional.of(server));
         when(server.getParser()).thenReturn(parser);
         when(channel.getChannelInfo()).thenReturn(channelinfo);
         when(channelinfo.getName()).thenReturn("#chan");

test/com/dmdirc/commandparser/parsers/CommandParserTest.java

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.parsers;
 
 import com.dmdirc.Channel;
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.commands.Command;
@@ -31,7 +32,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
-import com.dmdirc.DMDircMBassador;
+import java.util.Optional;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -73,7 +74,7 @@ public class CommandParserTest {
 
         when(configProvider.getOptionInt("general", "commandhistory")).thenReturn(10);
 
-        when(container.getConnection()).thenReturn(connection);
+        when(container.getOptionalConnection()).thenReturn(Optional.of(connection));
         when(connection.isValidChannelName("#channel1")).thenReturn(true);
         when(connection.isValidChannelName("#channel2")).thenReturn(true);
         when(connection.hasChannel("#channel1")).thenReturn(true);