Fix getConnection issues in debug plugin.

debug/src/com/dmdirc/addons/debug/DebugCommand.java

@@ -26,6 +26,7 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 
+import javax.annotation.Nonnull;
 import javax.inject.Provider;
 
 /**
@@ -82,7 +83,7 @@ public abstract class DebugCommand {
      * @param args    Arguments passed to this command
      * @param context The context the command was executed in
      */
-    public abstract void execute(final FrameContainer origin,
+    public abstract void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context);
 
     /**

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

@@ -29,6 +29,8 @@ import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.Connection;
 
+import java.util.Optional;
+
 import javax.inject.Inject;
 import javax.inject.Provider;
 
@@ -60,11 +62,9 @@ public class ServerInfo extends DebugCommand {
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        if (origin.getConnection() == null) {
-            sendLine(origin, args.isSilent(), FORMAT_ERROR,
-                    "This window isn't connected to a server");
-        } else {
-            final Connection connection = origin.getConnection();
+        final Optional<Connection> optionalConnection = origin.getOptionalConnection();
+        if (optionalConnection.isPresent()) {
+            final Connection connection = optionalConnection.get();
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Server name: "
                     + connection.getAddress());
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Actual name: "
@@ -75,10 +75,13 @@ public class ServerInfo extends DebugCommand {
                     + connection.getParser().getServerSoftware() + " - "
                     + connection.getParser().getServerSoftwareType());
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Modes: "
-                    + connection.getParser().getBooleanChannelModes() + " "
-                    + connection.getParser().getListChannelModes() + " "
-                    + connection.getParser().getParameterChannelModes() + " "
+                    + connection.getParser().getBooleanChannelModes() + ' '
+                    + connection.getParser().getListChannelModes() + ' '
+                    + connection.getParser().getParameterChannelModes() + ' '
                     + connection.getParser().getDoubleParameterChannelModes());
+        } else {
+            sendLine(origin, args.isSilent(), FORMAT_ERROR,
+                    "This window isn't connected to a server");
         }
     }
 

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

@@ -29,6 +29,8 @@ import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.Connection;
 
+import java.util.Optional;
+
 import javax.inject.Inject;
 import javax.inject.Provider;
 
@@ -60,13 +62,13 @@ public class ServerState extends DebugCommand {
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        if (origin.getConnection() == null) {
+        final Optional<Connection> optionalConnection = origin.getOptionalConnection();
+        if (optionalConnection.isPresent()) {
+            sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+                    optionalConnection.get().getStatus().getTransitionHistory());
+        } else {
             sendLine(origin, args.isSilent(), FORMAT_ERROR,
                     "This window isn't connected to a server");
-        } else {
-            final Connection connection = origin.getConnection();
-            sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
-                    connection.getStatus().getTransitionHistory());
         }
     }
 

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

@@ -27,7 +27,11 @@ import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.Connection;
 
+import java.util.Optional;
+
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Provider;
 
@@ -57,13 +61,14 @@ public class ShowRaw extends DebugCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        if (origin == null || origin.getConnection() == null) {
+        final Optional<Connection> connection = origin.getOptionalConnection();
+        if (connection.isPresent()) {
+            connection.get().addRaw();
+        } else {
             sendLine(origin, args.isSilent(), FORMAT_ERROR,
                     "Cannot show raw window here.");
-        } else {
-            origin.getConnection().addRaw();
         }
     }